diff options
author | Erik Johnston <erik@matrix.org> | 2015-08-21 11:39:38 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-08-21 11:39:38 +0100 |
commit | 745b72660acd6760334b7be51ad2d91eef2e0257 (patch) | |
tree | 3001ef666fa2c2f3d658f5e60dd3b08e39337be6 /synapse/handlers | |
parent | Return fully qualified user_id as per spec (diff) | |
parent | Fix bug where we didn't correctly serialize the redacted_because key over fed... (diff) | |
download | synapse-745b72660acd6760334b7be51ad2d91eef2e0257.tar.xz |
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 1e3dccf5a8..4ff20599d6 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -874,7 +874,7 @@ class FederationHandler(BaseHandler): raise AuthError(403, "Host not in room.") state_groups = yield self.store.get_state_groups( - [event_id] + room_id, [event_id] ) if state_groups: |