summary refs log tree commit diff
path: root/synapse/rest/client/v1/initial_sync.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-04 13:13:30 +0100
committerErik Johnston <erik@matrix.org>2019-09-04 13:13:30 +0100
commite80a5b7492d13e8b24a8c989ca25ad379dd9cf44 (patch)
treef16072be557cebe1bc386cb2f66ce15a7b002fbe /synapse/rest/client/v1/initial_sync.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentFix and refactor room and user stats (#5971) (diff)
downloadsynapse-e80a5b7492d13e8b24a8c989ca25ad379dd9cf44.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/v1/initial_sync.py')
-rw-r--r--synapse/rest/client/v1/initial_sync.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py

index 70b8478e90..2da3cd7511 100644 --- a/synapse/rest/client/v1/initial_sync.py +++ b/synapse/rest/client/v1/initial_sync.py
@@ -42,7 +42,7 @@ class InitialSyncRestServlet(RestServlet): include_archived=include_archived, ) - return (200, content) + return 200, content def register_servlets(hs, http_server):