summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-01 19:15:27 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-01 19:15:27 +0000
commitf73ea0bda26a51794abedb65cbf4d0a717dee26c (patch)
tree64fd41675594a7c71a7f119fb68b5b476f9173fd /synapse/federation/transport/server.py
parentOnly fire user_joined_room on the distributor if the user has actually joined... (diff)
parentMerge pull request #392 from matrix-org/markjh/client_config (diff)
downloadsynapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz
Merge branch 'develop' into markjh/edu_frequency
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 127b4da4f8..6b164fd2d1 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -165,7 +165,7 @@ class BaseFederationServlet(object):
             if code is None:
                 continue
 
-            server.register_path(method, pattern, self._wrap(code))
+            server.register_paths(method, (pattern,), self._wrap(code))
 
 
 class FederationSendServlet(BaseFederationServlet):