diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 14:29:03 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 14:29:03 +0000 |
| commit | aeda1b3b94296aac2a2d92dff6f23cf13fe3b4fa (patch) | |
| tree | 31f509920cdd52a1716da36ae7cf4c7e3be18bdb /tests/rest/client | |
| parent | Merge branch 'develop' into babolivier/context_filters (diff) | |
| parent | Merge branch 'develop' into babolivier/context_filters (diff) | |
| download | synapse-aeda1b3b94296aac2a2d92dff6f23cf13fe3b4fa.tar.xz | |
Merge branch 'babolivier/context_filters' of github.com:matrix-org/synapse into babolivier/context_filters
Diffstat (limited to 'tests/rest/client')
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index ea4b58d37a..4095e63aef 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -1524,4 +1524,4 @@ class LabelsTestCase(unittest.HomeserverTestCase): tok=self.tok, ) - return event_id \ No newline at end of file + return event_id |