tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

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

Browse source 
Hotfixes v0.7.0f
This commit is contained in:
Erik Johnston 2015-02-16 09:46:01 +00:00
commit 0421eb84ac
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/__init__.py
View file

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.7.0e"
__version__ = "0.7.0f"

2
synapse/handlers/federation.py
View file

@ -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
)