diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-29 16:50:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-29 16:52:33 +0000 |
| commit | 78015948a7febb18e000651f72f8f58830a55b93 (patch) | |
| tree | 42aac1eb30b723f21074bb814f33d8713008725a /synapse/federation/federation_client.py | |
| parent | Make post_json(...) actually send data. (diff) | |
| download | synapse-78015948a7febb18e000651f72f8f58830a55b93.tar.xz | |
Initial implementation of auth conflict resolution
Diffstat (limited to 'synapse/federation/federation_client.py')
| -rw-r--r-- | synapse/federation/federation_client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index ebcd593506..1173ca817b 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -345,7 +345,7 @@ class FederationClient(object): "auth_chain": [e.get_pdu_json(time_now) for e in local_auth], } - code, content = yield self.transport_layer.send_invite( + code, content = yield self.transport_layer.send_query_auth( destination=destination, room_id=room_id, event_id=event_id, |