diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-16 15:23:30 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-16 15:23:30 +0100 |
| commit | e5acc8a47b3c535c121afb5fb58bc35bc26992ff (patch) | |
| tree | 85755f9d0f088b4df0f984d302544f6ae18bdfc8 /synapse/federation/transport/server.py | |
| parent | Merge pull request #309 from matrix-org/erikj/_filter_events_for_client (diff) | |
| parent | Add signing host and keyname to signatures (diff) | |
| download | synapse-e5acc8a47b3c535c121afb5fb58bc35bc26992ff.tar.xz | |
Merge pull request #302 from matrix-org/daniel/3pidinvites
Implement third party identifier invites
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)) |