diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-16 15:35:35 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-16 15:35:35 +0100 |
| commit | 33646eb000e99abd4d9174276b105a4d0f00cfef (patch) | |
| tree | 903158f9fd9ae20e1b025f3e974ec40f132fa276 /synapse/federation/transport/server.py | |
| parent | Remove unused import (diff) | |
| parent | Merge pull request #311 from matrix-org/markjh/postgres_fixes (diff) | |
| download | synapse-33646eb000e99abd4d9174276b105a4d0f00cfef.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/federation/transport/server.py')
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 36f250e1a3..6e394f039e 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -292,7 +292,7 @@ class FederationMakeJoinServlet(BaseFederationServlet): @defer.inlineCallbacks def on_GET(self, origin, content, query, context, user_id): - content = yield self.handler.on_make_join_request(context, user_id) + content = yield self.handler.on_make_join_request(context, user_id, query) defer.returnValue((200, content)) |