summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-02 15:28:32 +0100
committerErik Johnston <erik@matrix.org>2018-08-02 15:28:32 +0100
commit1a568041fae3d14ca68383905af33914e6c75d82 (patch)
tree2d5cc226b72e000314de8ea5c67df79c742a805b /synapse/federation/federation_server.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3642 from matrix-org/rav/another_room_id_check (diff)
downloadsynapse-1a568041fae3d14ca68383905af33914e6c75d82.tar.xz
Merge branch 'release-v0.33.1' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py

index e501251b6e..015ef6334a 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py
@@ -430,6 +430,7 @@ class FederationServer(FederationBase): ret = yield self.handler.on_query_auth( origin, event_id, + room_id, signed_auth, content.get("rejects", []), content.get("missing", []),