diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-06 13:35:03 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-06 13:35:03 +0100 |
| commit | 953dbd28a726dc47829e5d774c78288ed7c91e72 (patch) | |
| tree | 6d4dbf2656816e1506f16c272fd4d8c5357fea2e /synapse/handlers/register.py | |
| parent | Add support for using keyword arguments with cached functions (diff) | |
| parent | Up the cache size for 'get_joined_hosts_for_room' and 'get_users_in_room' (diff) | |
| download | synapse-953dbd28a726dc47829e5d774c78288ed7c91e72.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_keyword_args
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index a1288b4252..f81d75017d 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -73,7 +73,8 @@ class RegistrationHandler(BaseHandler): localpart : The local part of the user ID to register. If None, one will be randomly generated. password (str) : The password to assign to this user so they can - login again. + login again. This can be None which means they cannot login again + via a password (e.g. the user is an application service user). Returns: A tuple of (user_id, access_token). Raises: |