diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-03 13:40:47 +0100 |
commit | 897c51d2742bead151a6306cd236b517982b8a69 (patch) | |
tree | 75f588d3949381a3d049eb5f192dba4ded09d0ec /synapse/storage/event_federation.py | |
parent | update generate_monthly_active_users, and reap_monthly_active_users (diff) | |
parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
download | synapse-897c51d2742bead151a6306cd236b517982b8a69.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker
Diffstat (limited to 'synapse/storage/event_federation.py')
-rw-r--r-- | synapse/storage/event_federation.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index 8bd35df119..24345b20a6 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -343,6 +343,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, table="events", keyvalues={ "event_id": event_id, + "room_id": room_id, }, retcol="depth", allow_none=True, |