diff options
Diffstat (limited to '')
| -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 1060fcc866..7ba21cd247 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.0c" +__version__ = "0.7.0d" diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index d667d358ab..4cd795e202 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -878,7 +878,7 @@ class FederationHandler(BaseHandler): (d.type, d.state_key) for d in different_events }) - new_state, prev_state = self.state.resolve_events( + new_state, prev_state = self.state_handler.resolve_events( [local_view, remote_view], event ) |