Merge release-v1.7.1 into develop

This commit is contained in:
Richard van der Hoff 2019-12-18 09:51:51 +00:00
commit 6e8f8e14f2
7 changed files with 145 additions and 10 deletions

View file

@ -671,6 +671,7 @@ class FederationHandler(BaseHandler):
bad_room_id,
room_id,
)
del fetched_events[bad_event_id]
return fetched_events