diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-09 15:32:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-09 15:32:07 +0100 |
commit | cddf91c8b942167feb1e1b87e3c3e80dbc7fa02f (patch) | |
tree | cda316a97bc6538074c66cb6267ce23f0793ec78 /synapse/rest/client/v2_alpha/notifications.py | |
parent | Remove unused code path from member change DB func (diff) | |
parent | Merge pull request #3196 from matrix-org/erikj/pagination_return (diff) | |
download | synapse-cddf91c8b942167feb1e1b87e3c3e80dbc7fa02f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_membership_change
Diffstat (limited to 'synapse/rest/client/v2_alpha/notifications.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/notifications.py | 2 |
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, |