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

Hotfixes v0.7.0f

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"

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
                 )