summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-05-09 15:32:07 +0100
committerErik Johnston <erik@matrix.org>2018-05-09 15:32:07 +0100
commitcddf91c8b942167feb1e1b87e3c3e80dbc7fa02f (patch)
treecda316a97bc6538074c66cb6267ce23f0793ec78 /synapse/rest
parentRemove unused code path from member change DB func (diff)
parentMerge pull request #3196 from matrix-org/erikj/pagination_return (diff)
downloadsynapse-cddf91c8b942167feb1e1b87e3c3e80dbc7fa02f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_membership_change
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/notifications.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/notifications.py b/synapse/rest/client/v2_alpha/notifications.py
index ec170109fe..66583d6778 100644
--- a/synapse/rest/client/v2_alpha/notifications.py
+++ b/synapse/rest/client/v2_alpha/notifications.py
@@ -88,7 +88,7 @@ class NotificationsServlet(RestServlet):
                     pa["topological_ordering"], pa["stream_ordering"]
                 )
             returned_push_actions.append(returned_pa)
-            next_token = pa["stream_ordering"]
+            next_token = str(pa["stream_ordering"])
 
         defer.returnValue((200, {
             "notifications": returned_push_actions,