summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/notifications.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-14 08:56:24 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-14 08:56:24 +0100
commit703f9ff3c9e757caf4c17b2d34dd500f1ad99dd6 (patch)
treec1505d3d2e4dbce686e5617032db2df87182824a /synapse/rest/client/v2_alpha/notifications.py
parentNewsfile (diff)
parent1.3.0rc1 (diff)
downloadsynapse-703f9ff3c9e757caf4c17b2d34dd500f1ad99dd6.tar.xz
Merge branch 'develop' into rei/room_stats_separated
Diffstat (limited to 'synapse/rest/client/v2_alpha/notifications.py')
-rw-r--r--synapse/rest/client/v2_alpha/notifications.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/rest/client/v2_alpha/notifications.py b/synapse/rest/client/v2_alpha/notifications.py

index 728a52328f..d034863a3c 100644 --- a/synapse/rest/client/v2_alpha/notifications.py +++ b/synapse/rest/client/v2_alpha/notifications.py
@@ -88,9 +88,7 @@ class NotificationsServlet(RestServlet): returned_push_actions.append(returned_pa) next_token = str(pa["stream_ordering"]) - defer.returnValue( - (200, {"notifications": returned_push_actions, "next_token": next_token}) - ) + return (200, {"notifications": returned_push_actions, "next_token": next_token}) def register_servlets(hs, http_server):