Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse

matrix-org · Feb 20, 2015 · 2b45ca1 · 2b45ca1
2 parents 894a89d + dc0ee55
commit 2b45ca1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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.1"
+__version__ = "0.7.1-r1"
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -875,7 +875,7 @@ def do_auth(self, origin, event, context, auth_events):
                 local_view = dict(auth_events)
                 remote_view = dict(auth_events)
                 remote_view.update({
-                    (d.type, d.state_key) for d in different_events
+                    (d.type, d.state_key): d for d in different_events
                 })
 
                 new_state, prev_state = self.state_handler.resolve_events(