diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
commit | 897c51d2742bead151a6306cd236b517982b8a69 (patch) | |
tree | 75f588d3949381a3d049eb5f192dba4ded09d0ec /synapse/federation/federation_server.py | |
parent | update generate_monthly_active_users, and reap_monthly_active_users (diff) | |
parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
download | synapse-897c51d2742bead151a6306cd236b517982b8a69.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker
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", []), |