diff options
| author | Erik Johnston <erikj@jki.re> | 2016-07-07 13:34:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 13:34:28 +0100 |
| commit | 70d650be2b9c7a46ade43ef6ff3f6d07a7f36cc9 (patch) | |
| tree | 9c46c887f687a01f44ccae03be3fea75c079ea85 /synapse/handlers/federation.py | |
| parent | Merge pull request #909 from matrix-org/erikj/shared_secret (diff) | |
| parent | Comment (diff) | |
| download | synapse-70d650be2b9c7a46ade43ef6ff3f6d07a7f36cc9.tar.xz | |
Merge pull request #911 from matrix-org/erikj/purge_history
Feature: Purge local room history.
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 6c0bc7eafa..351b218247 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1413,7 +1413,7 @@ class FederationHandler(BaseHandler): local_view = dict(auth_events) remote_view = dict(auth_events) remote_view.update({ - (d.type, d.state_key): d for d in different_events + (d.type, d.state_key): d for d in different_events if d }) new_state, prev_state = self.state_handler.resolve_events( |