Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Erik Johnston 2015-02-13 15:46:42 +00:00
parent 0d872f5aa6 be26697b29
commit 650dc7f0f9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/__init__.py
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.0c" __version__ = "0.7.0d"

2
synapse/handlers/federation.py
View File

@ -878,7 +878,7 @@ class FederationHandler(BaseHandler):
(d.type, d.state_key) for d in different_events (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], [local_view, remote_view],
event event
) )