diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-13 13:17:08 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-13 13:17:08 +0000 |
| commit | bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3 (patch) | |
| tree | 42423f71093a796415971f66ec4a24712bab42c2 /synapse/rest/client/v1/room.py | |
| parent | Add docstring (diff) | |
| parent | Merge pull request #2980 from matrix-org/erikj/rm_priv (diff) | |
| download | synapse-bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave
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 |