Merge branch 'master' into develop

This commit is contained in:
David Robertson 2022-05-17 11:00:54 +01:00
commit 1402159bb8
No known key found for this signature in database
GPG key ID: 903ECE108A39DEDD
4 changed files with 22 additions and 4 deletions

View file

@ -750,7 +750,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
WHERE room_id = ?
AND stream_ordering <= ?
AND NOT outlier
AND rejections.reason IS NULL
AND rejections.event_id IS NULL
ORDER BY stream_ordering DESC
LIMIT 1
"""