forked from MirrorHub/synapse
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
8a59915d7d
|
@ -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
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
""" This is a reference implementation of a Matrix home server.
|
||||
"""
|
||||
|
||||
__version__ = "0.7.0e"
|
||||
__version__ = "0.7.0f"
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in a new issue