summary refs log tree commit diff
path: root/synapse/rest/presence.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-27 11:38:13 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-27 11:38:13 +0100
commita8774cf351c5d1af98ed80dd0da6fadc09af7da3 (patch)
tree82920cd159ff73e3fd61a6dc5b7100d7f95918af /synapse/rest/presence.py
parentAdded support for GET /events/$eventid with auth checks. (diff)
parentFinal url modifications: renamed /presence_list to /presence/list to keep the... (diff)
downloadsynapse-a8774cf351c5d1af98ed80dd0da6fadc09af7da3.tar.xz
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'synapse/rest/presence.py')
-rw-r--r--synapse/rest/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/presence.py b/synapse/rest/presence.py
index 6043848595..e013b20853 100644
--- a/synapse/rest/presence.py
+++ b/synapse/rest/presence.py
@@ -68,7 +68,7 @@ class PresenceStatusRestServlet(RestServlet):
 
 
 class PresenceListRestServlet(RestServlet):
-    PATTERN = client_path_pattern("/presence_list/(?P<user_id>[^/]*)")
+    PATTERN = client_path_pattern("/presence/list/(?P<user_id>[^/]*)")
 
     @defer.inlineCallbacks
     def on_GET(self, request, user_id):