summary refs log tree commit diff
path: root/synapse/handlers/receipts.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-09-12 11:14:56 +0100
committerMark Haines <mark.haines@matrix.org>2016-09-12 11:14:56 +0100
commit4a32d25d4c97b10f74e636d46b312ba6b660987b (patch)
tree53c35423e6469adc87cc5b213d5b960fd143277c /synapse/handlers/receipts.py
parentFix unit tests (diff)
parentMerge pull request #1102 from matrix-org/revert-1099-dbkr/make_notif_highligh... (diff)
downloadsynapse-4a32d25d4c97b10f74e636d46b312ba6b660987b.tar.xz
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'synapse/handlers/receipts.py')
-rw-r--r--synapse/handlers/receipts.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py

index 726f7308d2..e536a909d0 100644 --- a/synapse/handlers/receipts.py +++ b/synapse/handlers/receipts.py
@@ -156,6 +156,7 @@ class ReceiptsHandler(BaseHandler): } }, }, + key=(room_id, receipt_type, user_id), ) @defer.inlineCallbacks