summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-02 09:30:20 +0000
committerErik Johnston <erik@matrix.org>2017-02-02 09:30:20 +0000
commitf57cb2195213767d37c0194e17be60ee3c6b5b47 (patch)
tree0bfc36342bddcc18001f0f37c1c124de1f49ee78 /synapse/handlers/sync.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #1872 from matrix-org/erikj/key_changes (diff)
downloadsynapse-f57cb2195213767d37c0194e17be60ee3c6b5b47.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 9199f20817..9a44de3f33 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -130,7 +130,8 @@ class SyncResult(collections.namedtuple("SyncResult", [ self.invited or self.archived or self.account_data or - self.to_device + self.to_device or + self.device_lists )