Merge branch 'master' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
650dc7f0f9
2 changed files with 2 additions and 2 deletions
|
@ -16,4 +16,4 @@
|
|||
""" This is a reference implementation of a Matrix home server.
|
||||
"""
|
||||
|
||||
__version__ = "0.7.0c"
|
||||
__version__ = "0.7.0d"
|
||||
|
|
|
@ -878,7 +878,7 @@ class FederationHandler(BaseHandler):
|
|||
(d.type, d.state_key) for d in different_events
|
||||
})
|
||||
|
||||
new_state, prev_state = self.state.resolve_events(
|
||||
new_state, prev_state = self.state_handler.resolve_events(
|
||||
[local_view, remote_view],
|
||||
event
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue