summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-16 09:47:22 +0000
committerErik Johnston <erik@matrix.org>2015-02-16 09:47:22 +0000
commit8a59915d7d3d0001cb5f9e382efcf65dcbc25359 (patch)
treefc9e8a2d1b5a9a84bfe12738e2e04a499b72d482 /synapse/handlers
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentBump version (diff)
downloadsynapse-8a59915d7d3d0001cb5f9e382efcf65dcbc25359.tar.xz
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py2
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
                 )