diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-11-17 12:03:07 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-11-17 12:03:07 +0000 |
| commit | b102e935719c7a8e6470be31d1f6ae041d77ac40 (patch) | |
| tree | 1e9606df68597b06570da68deb2ffde2d106738e /synapse | |
| parent | Revert "Merge pull request #2679 from jkolo/fix_auth_handler" (diff) | |
| parent | Bump version in __init__.py (diff) | |
| download | synapse-b102e935719c7a8e6470be31d1f6ae041d77ac40.tar.xz | |
Merge branch 'release-v0.25.1'
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/auth.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index e04208961f..8c3d7a210a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.25.0" +__version__ = "0.25.1" diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 7a0ba6ef35..080eb14271 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -551,7 +551,7 @@ class AuthHandler(BaseHandler): qualified_user_id, password, ) if is_valid: - defer.returnValue(qualified_user_id) + defer.returnValue((qualified_user_id, None)) if (not hasattr(provider, "get_supported_login_types") or not hasattr(provider, "check_auth")): |