summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-07-01 11:12:28 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-07-01 11:12:28 +0100
commit8fed03aa3efd1b9c80b3115caea577fa4d5a58bd (patch)
tree0d95b6892c524adcfad5374891c867e68e640935 /synapse/handlers/sync.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentBack out MSC2625 implementation (#7761) (diff)
downloadsynapse-8fed03aa3efd1b9c80b3115caea577fa4d5a58bd.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, 0 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py

index b7c74d6219..f631c34f92 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -1896,9 +1896,6 @@ class SyncHandler(object): if notifs is not None: unread_notifications["notification_count"] = notifs["notify_count"] unread_notifications["highlight_count"] = notifs["highlight_count"] - unread_notifications["org.matrix.msc2625.unread_count"] = notifs[ - "unread_count" - ] sync_result_builder.joined.append(room_sync)