summary refs log tree commit diff
path: root/synapse/handlers/receipts.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 17:32:09 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 17:32:09 +0100
commitffc30b8f60995ed515bcb87eb480a79be143f0d0 (patch)
treebc873f6e36b2a1b51f7d1472f5ed546cd43bdd1f /synapse/handlers/receipts.py
parentMerge pull request #5924 from matrix-org/rei/rss_inc6 (diff)
parentRevert "Add m.id_access_token flag (#5930)" (#5945) (diff)
downloadsynapse-ffc30b8f60995ed515bcb87eb480a79be143f0d0.tar.xz
Merge branch 'develop' into rei/rss_target
Diffstat (limited to 'synapse/handlers/receipts.py')
-rw-r--r--synapse/handlers/receipts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py

index 73973502a4..6854c751a6 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py
@@ -148,7 +148,7 @@ class ReceiptEventSource(object): to_key = yield self.get_current_key() if from_key == to_key: - return ([], to_key) + return [], to_key events = yield self.store.get_linearized_receipts_for_rooms( room_ids, from_key=from_key, to_key=to_key