Merge pull request #73 from matrix-org/hotfixes-v0.7.0f

Hotfixes v0.7.0f
2015-02-16 09:46:01 +00:00 · 2015-02-16 09:46:01 +00:00 · 0421eb84ac
parent 2b8903ce2f 6dd5c95841
commit 0421eb84ac
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.0e"
+__version__ = "0.7.0f"
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@ -879,7 +879,7 @@ class FederationHandler(BaseHandler):
                })

                new_state, prev_state = self.state_handler.resolve_events(
-                    [local_view, remote_view],
+                    [local_view.values(), remote_view.values()],
                    event
                )