summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/sync.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-19 17:06:14 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-19 17:06:14 +0100
commitd47db9e9e9fad4e171aab3de12dd5c214cf71ed4 (patch)
tree8f4dd37e2694f18ad44b1b69e3cd1e04b591b6e5 /synapse/rest/client/v2_alpha/sync.py
parentMerge commit 'fe6cfc80e' into anoa/dinsic_release_1_21_x (diff)
parentRevert #7736 (#8039) (diff)
downloadsynapse-d47db9e9e9fad4e171aab3de12dd5c214cf71ed4.tar.xz
Merge commit '2ffd6783c' into anoa/dinsic_release_1_21_x
* commit '2ffd6783c':
  Revert #7736 (#8039)
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py

index 3f5bf75e59..a5c24fbd63 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py
@@ -426,7 +426,6 @@ class SyncRestServlet(RestServlet): result["ephemeral"] = {"events": ephemeral_events} result["unread_notifications"] = room.unread_notifications result["summary"] = room.summary - result["org.matrix.msc2654.unread_count"] = room.unread_count return result