diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-12-18 09:51:51 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-12-18 09:51:51 +0000 |
commit | 6e8f8e14f272a5de61de675f6a01a5e1fc834c41 (patch) | |
tree | 5cc934c1e024e101cde67f698ee5b957101942b3 /synapse/handlers/federation.py | |
parent | Remove unused `get_pagination_rows` methods. (#6557) (diff) | |
parent | Fix bug where we added duplicate event IDs as auth_events (#6560) (diff) | |
download | synapse-6e8f8e14f272a5de61de675f6a01a5e1fc834c41.tar.xz |
Merge release-v1.7.1 into develop
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 3fccccfecd..60bb00fc6a 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -671,6 +671,7 @@ class FederationHandler(BaseHandler): bad_room_id, room_id, ) + del fetched_events[bad_event_id] return fetched_events |