diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-15 20:20:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-15 20:20:51 +0000 |
| commit | b99a33f283d595f5f462ab039d672ca04bdffcb8 (patch) | |
| tree | 8da0d9033d1c6d0f317274ccf14ed31a76f9ebb6 /synapse | |
| parent | we federate on port 8448 nowadays... (diff) | |
| download | synapse-b99a33f283d595f5f462ab039d672ca04bdffcb8.tar.xz | |
resolve_events expect lists, not dicts
Diffstat (limited to 'synapse')
| -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 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 ) |