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

2015-02-13 15:46:42 +00:00 · 2015-02-13 15:46:42 +00:00 · 650dc7f0f9
parent 0d872f5aa6 be26697b29
commit 650dc7f0f9
2 changed files with 2 additions and 2 deletions
--- a/synapse/init.py
+++ b/synapse/init.py
@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """

-__version__ = "0.7.0c"
+__version__ = "0.7.0d"
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@ -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
                )