diff options
| author | David Baker <dave@matrix.org> | 2017-03-01 17:20:37 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-03-01 17:20:37 +0000 |
| commit | 3557cf34dc011211db1b80016ce09ada86b41ffc (patch) | |
| tree | 9ff6c82f81d7a932ffc1d66d677a5cfa65157494 /synapse/handlers/federation.py | |
| parent | WIP support for msisdn 3pid proxy methods (diff) | |
| parent | kick jenkins (diff) | |
| download | synapse-3557cf34dc011211db1b80016ce09ada86b41ffc.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin
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 996bfd0e23..ed0fa51e7f 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1096,7 +1096,7 @@ class FederationHandler(BaseHandler): if prev_id != event.event_id: results[(event.type, event.state_key)] = prev_id else: - del results[(event.type, event.state_key)] + results.pop((event.type, event.state_key), None) defer.returnValue(results.values()) else: |