0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 08:53:46 +01:00

Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse

This commit is contained in:
Erik Johnston 2015-02-20 15:40:47 +00:00
commit 2b45ca1541
2 changed files with 2 additions and 2 deletions

View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.7.1" __version__ = "0.7.1-r1"

View file

@ -875,7 +875,7 @@ class FederationHandler(BaseHandler):
local_view = dict(auth_events) local_view = dict(auth_events)
remote_view = dict(auth_events) remote_view = dict(auth_events)
remote_view.update({ 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( new_state, prev_state = self.state_handler.resolve_events(