Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2019-07-26 12:39:33 +01:00
commit d74595e2ca
6 changed files with 38 additions and 4 deletions

View file

@ -640,6 +640,10 @@ class EventsWorkerStore(SQLBaseStore):
# we choose to ignore redactions of m.room.create events.
return None
if original_ev.type == "m.room.redaction":
# ... and redaction events
return None
redaction_map = yield self._get_events_from_cache_or_db(redactions)
for redaction_id in redactions: