diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
| commit | 12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0 (patch) | |
| tree | 1db11e8ee3cd835de2c8d33aaf9534573d0ac357 /synapse/rest/client/v1/room.py | |
| parent | ensure we always include the members for a given timeline block (diff) | |
| parent | typoe (diff) | |
| download | synapse-12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0.tar.xz | |
merge proper fix to bug 2969
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 9d745174c7..f8999d64d7 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -599,7 +599,7 @@ class RoomMembershipRestServlet(ClientV1RestServlet): def register(self, http_server): # /rooms/$roomid/[invite|join|leave] PATTERNS = ("/rooms/(?P<room_id>[^/]*)/" - "(?P<membership_action>join|invite|leave|ban|unban|kick|forget)") + "(?P<membership_action>join|invite|leave|ban|unban|kick)") register_txn_path(self, PATTERNS, http_server) @defer.inlineCallbacks |