summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-02 16:50:28 +0000
committerErik Johnston <erik@matrix.org>2017-02-02 16:50:28 +0000
commitf8c407a13b04f906dc761bcf33992e05af219098 (patch)
tree0479c242f3d7df94437755296616e657a0a15858 /synapse/notifier.py
parentUpdate changelog (diff)
parentMerge pull request #1877 from matrix-org/erikj/device_list_fixes (diff)
downloadsynapse-f8c407a13b04f906dc761bcf33992e05af219098.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0
Diffstat (limited to '')
-rw-r--r--synapse/notifier.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py

index acbd4bb5ae..8051a7a842 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py
@@ -378,6 +378,7 @@ class Notifier(object): limit=limit, is_guest=is_peeking, room_ids=room_ids, + explicit_room_id=explicit_room_id, ) if name == "room":