summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-08 14:39:31 +0100
committerErik Johnston <erik@matrix.org>2016-06-08 14:39:31 +0100
commitd88faf92d16d9384433452e4fb7901fd2bd6eda4 (patch)
treed288a933349a3cb8d572b6303f5450994c594b29 /synapse/federation/transport/server.py
parentMerge pull request #856 from matrix-org/erikj/fed_pub_rooms (diff)
downloadsynapse-d88faf92d16d9384433452e4fb7901fd2bd6eda4.tar.xz
Fix up federation PublicRoomList
Diffstat (limited to 'synapse/federation/transport/server.py')
-rw-r--r--synapse/federation/transport/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index ab9f38f010..6fc3e2207c 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -528,7 +528,7 @@ class PublicRoomList(BaseFederationServlet):
     PATH = "/publicRooms"
 
     @defer.inlineCallbacks
-    def on_GET(self, request):
+    def on_GET(self, origin, content, query):
         data = yield self.room_list_handler.get_local_public_room_list()
         defer.returnValue((200, data))