summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-16 09:46:01 +0000
committerErik Johnston <erik@matrix.org>2015-02-16 09:46:01 +0000
commit0421eb84acb31b0a183d6f377b98ea0af4c7859b (patch)
tree76531c15a9702ffbe582c067359e7db241abac88 /synapse
parentwe federate on port 8448 nowadays... (diff)
parentBump version (diff)
downloadsynapse-0421eb84acb31b0a183d6f377b98ea0af4c7859b.tar.xz
Merge pull request #73 from matrix-org/hotfixes-v0.7.0f v0.7.0f
Hotfixes v0.7.0f
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/handlers/federation.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1a02aefe26..792b8089f6 100644
--- 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"
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
                 )