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

Hotfixes v0.7.0f

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 4cd795e202..3aecc1ca51 100644
--- 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
                 )