MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-01 00:48:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop

Browse source
This commit is contained in:
Erik Johnston 2015-02-16 09:47:22 +00:00
parent 5f68529036 6dd5c95841
commit 8a59915d7d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -6,7 +6,7 @@ VoIP. The basics you need to know to get up and running are:
- Everything in Matrix happens in a room. Rooms are distributed and do not
exist on any single server. Rooms can be located using convenience aliases
like ``#matrix:matrix.org`` or ``#test:localhost:8008``.
like ``#matrix:matrix.org`` or ``#test:localhost:8448``.
- Matrix user IDs look like ``@matthew:matrix.org`` (although in the future
you will normally refer to yourself and others using a 3PID: email

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
)