summary refs log tree commit diff
path: root/synapse/app/synchrotron.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-02 14:54:07 +0100
committerErik Johnston <erik@matrix.org>2016-09-02 14:54:07 +0100
commit3baf641a487f5adffd20a55cb93f36d4620c626c (patch)
tree737609506c74db37a83a3d18267a4defe707793d /synapse/app/synchrotron.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage (diff)
parentExplicitly specify state_key for history_visibility fetching (diff)
downloadsynapse-3baf641a487f5adffd20a55cb93f36d4620c626c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/app/synchrotron.py')
-rw-r--r--synapse/app/synchrotron.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py

index b8cedc7af5..07d3d047c6 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py
@@ -399,6 +399,9 @@ class SynchrotronServer(HomeServer): notify_from_stream( result, "typing", "typing_key", room="room_id" ) + notify_from_stream( + result, "to_device", "to_device_key", user="user_id" + ) while True: try: