diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-20 16:06:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-20 16:06:28 +0000 |
| commit | 7367ca42b597f9863819a5dd9fb628273ce71614 (patch) | |
| tree | 119fb440d82356a352ec007ee0dc09e948a9ce5f /synapse | |
| parent | Merge pull request #84 from matrix-org/disable_registration (diff) | |
| parent | Merge branch 'hotfixes-v0.7.1-r1' of github.com:matrix-org/synapse (diff) | |
| download | synapse-7367ca42b597f9863819a5dd9fb628273ce71614.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index a804a25748..f8ec4b0459 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.1" +__version__ = "0.7.1-r1" diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0eb2ff95ca..7deed16f9c 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -875,7 +875,7 @@ class FederationHandler(BaseHandler): 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( |