diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-13 09:59:54 +0000 |
| commit | 672dcf59d3f9da12da43a77e316e2eec76d3ee4c (patch) | |
| tree | 9186644b06ef01e609ca018e02100ceecf0f3ea4 /synapse/handlers/federation.py | |
| parent | Merge tag 'v0.19.3-rc1' into release-v0.19.3 (diff) | |
| parent | Revert "Support registration & login with phone number" (diff) | |
| download | synapse-672dcf59d3f9da12da43a77e316e2eec76d3ee4c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.3
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: |