diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-08-02 15:43:30 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-08-02 15:43:30 +0100 |
commit | 704c3e62399b47970b1d319740e591a6f08366da (patch) | |
tree | 5e906af495e6f27ebd7977810dd3979efca7d35a /synapse/federation/federation_server.py | |
parent | Merge pull request #3621 from matrix-org/erikj/split_fed_store (diff) | |
parent | Merge tag 'v0.33.1' (diff) | |
download | synapse-704c3e62399b47970b1d319740e591a6f08366da.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r-- | synapse/federation/federation_server.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 657935d1ac..bf89d568af 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -426,6 +426,7 @@ class FederationServer(FederationBase): ret = yield self.handler.on_query_auth( origin, event_id, + room_id, signed_auth, content.get("rejects", []), content.get("missing", []), |