diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-07-26 12:39:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-07-26 12:39:33 +0100 |
| commit | d74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a (patch) | |
| tree | a00671f417602e46b5e6d9c31bcd2f92b4095673 /synapse | |
| parent | Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatch (diff) | |
| parent | yet more changelog attribution fixes (diff) | |
| download | synapse-d74595e2ca2fcf23c04d28e11d4fe1de74ed4f4a.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/events_worker.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 3435de4e2f..8301a13d8f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -35,4 +35,4 @@ try: except ImportError: pass -__version__ = "1.2.0" +__version__ = "1.2.1" diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py index f63810a8c7..79680ee856 100644 --- a/synapse/storage/events_worker.py +++ b/synapse/storage/events_worker.py @@ -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: |