Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:56:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu

Browse source
This commit is contained in:
Erik Johnston 2015-02-23 14:36:00 +00:00
commit e25e0f4da9
7 changed files with 45 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/handlers/federation.py
View file

@ -899,7 +899,7 @@ class FederationHandler(BaseHandler):
local_view = dict(auth_events)
remote_view = dict(auth_events)
remote_view.update({
(d.type, d.state_key) for d in different_events
(d.type, d.state_key): d for d in different_events
})
new_state, prev_state = self.state_handler.resolve_events(