summary refs log tree commit diff
path: root/synapse/module_api/__init__.py
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-09-04 19:12:29 -0400
committerHubert Chathi <hubert@uhoreg.ca>2019-09-04 19:12:29 -0400
commitfaf72a4c403000f7815d171feb8bf1a83b353584 (patch)
treed150b317ef4d0cf2245b664a37e51d76c0870352 /synapse/module_api/__init__.py
parentMerge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_keys (diff)
parentRemove bind_email and bind_msisdn (#5964) (diff)
downloadsynapse-faf72a4c403000f7815d171feb8bf1a83b353584.tar.xz
Merge branch 'develop' into cross-signing_keys
Diffstat (limited to 'synapse/module_api/__init__.py')
-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.