diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-16 09:47:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-16 09:47:22 +0000 |
| commit | 8a59915d7d3d0001cb5f9e382efcf65dcbc25359 (patch) | |
| tree | fc9e8a2d1b5a9a84bfe12738e2e04a499b72d482 | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Bump version (diff) | |
| download | synapse-8a59915d7d3d0001cb5f9e382efcf65dcbc25359.tar.xz | |
Merge branch 'hotfixes-v0.7.0f' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/README.rst b/README.rst index 5eebe5b721..d3778b9f2e 100644 --- a/README.rst +++ b/README.rst @@ -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 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 ) |