diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 16:56:29 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-04 16:56:29 -0700 |
commit | 19bb5c80241782dbb257aabb40094c1aa8c22847 (patch) | |
tree | 97fdf219de3ed852dfe3e35aebe98a4f1122a9ba /synapse/module_api/__init__.py | |
parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
parent | add user signature stream change cache to slaved device store (diff) | |
download | synapse-19bb5c80241782dbb257aabb40094c1aa8c22847.tar.xz |
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Cross-signing [2/4] - upload/download keys
Diffstat (limited to 'synapse/module_api/__init__.py')
-rw-r--r-- | synapse/module_api/__init__.py | 2 |
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. |