From b11a6e1c3ca51e81b911fa733a4169bd6cbaa5ee Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 13 Feb 2015 15:37:18 +0000 Subject: [PATCH 1/2] Fix wrong variable name --- synapse/handlers/federation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index d667d358a..4cd795e20 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 ) From be26697b29a44b96cb0ed371ca4aaab2654d6802 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 13 Feb 2015 15:37:35 +0000 Subject: [PATCH 2/2] Bump version --- synapse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/__init__.py b/synapse/__init__.py index 1060fcc86..7ba21cd24 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"