summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-06-25 20:12:13 +0100
committerErik Johnston <erik@matrix.org>2018-06-25 20:12:13 +0100
commitc0128c1021f6f34dd621b0111b34c21a151b24e6 (patch)
treed5c46bab7bbbc3377728c08eaaeae0a4912db2cc /synapse/handlers/sync.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3443 from matrix-org/erikj/fast_filter_servers (diff)
downloadsynapse-c0128c1021f6f34dd621b0111b34c21a151b24e6.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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index 8df66b0fcf..dc2446bbed 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -146,7 +146,7 @@ class SyncResult(collections.namedtuple("SyncResult", [ "invited", # InvitedSyncResult for each invited room. "archived", # ArchivedSyncResult for each archived room. "to_device", # List of direct messages for the device. - "device_lists", # List of user_ids whose devices have chanegd + "device_lists", # List of user_ids whose devices have changed "device_one_time_keys_count", # Dict of algorithm to count for one time keys # for this device "groups",