summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/sync.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-07-31 10:30:05 +0100
committerRichard van der Hoff <richard@matrix.org>2020-07-31 10:30:05 +0100
commit82fec809a5c8be0a19bf2ca14f66d8d041dafeda (patch)
tree44adeb288d4659413e626f50e46d716401298d2a /synapse/rest/client/v2_alpha/sync.py
parentMerge branch 'release-v1.18.0' into matrix-org-hotfixes (diff)
parentAdd docs for undoing room shutdowns (#7998) (diff)
downloadsynapse-82fec809a5c8be0a19bf2ca14f66d8d041dafeda.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py

index a5c24fbd63..3f5bf75e59 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py
@@ -426,6 +426,7 @@ 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