Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse
commit
2b45ca1541
|
@ -16,4 +16,4 @@
|
|||
""" This is a reference implementation of a Matrix home server.
|
||||
"""
|
||||
|
||||
__version__ = "0.7.1"
|
||||
__version__ = "0.7.1-r1"
|
||||
|
|
|
@ -875,7 +875,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(
|
||||
|
|
Loading…
Reference in New Issue