summary refs log tree commit diff
path: root/synapse/module_api
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/module_api
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/module_api')
-rw-r--r--synapse/module_api/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/module_api/__init__.py b/synapse/module_api/__init__.py

index 41147d4292..735b882363 100644 --- a/synapse/module_api/__init__.py +++ b/synapse/module_api/__init__.py
@@ -101,7 +101,7 @@ class ModuleApi(object): ) user_id = yield self.register_user(localpart, displayname, emails) _, access_token = yield self.register_device(user_id) - return (user_id, access_token) + return user_id, access_token def register_user(self, localpart, displayname=None, emails=[]): """Registers a new user with given localpart and optional displayname, emails.