Merge branch 'master' into develop

This commit is contained in:
Richard van der Hoff 2018-08-02 15:43:30 +01:00
commit 704c3e6239
11 changed files with 77 additions and 21 deletions

View file

@ -343,6 +343,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore,
table="events",
keyvalues={
"event_id": event_id,
"room_id": room_id,
},
retcol="depth",
allow_none=True,