diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
| commit | 66a4d3352447f170afcddd1270c1a743273d19e6 (patch) | |
| tree | 49ee0260dd816d6f7c640f742c4895c6b5cb10fb /synapse/rest/room.py | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Merge branch 'client_server_url_rename' into develop (diff) | |
| download | synapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'synapse/rest/room.py')
| -rw-r--r-- | synapse/rest/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index 6771da8fcd..b031ad1bc4 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -306,7 +306,7 @@ class FeedbackRestServlet(RestServlet): class RoomMemberListRestServlet(RestServlet): - PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members/list$") + PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members$") @defer.inlineCallbacks def on_GET(self, request, room_id): @@ -333,7 +333,7 @@ class RoomMemberListRestServlet(RestServlet): class RoomMessageListRestServlet(RestServlet): - PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/messages/list$") + PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/messages$") @defer.inlineCallbacks def on_GET(self, request, room_id): |