summary refs log tree commit diff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 10:37:43 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 10:37:43 +0100
commit5bc94845378aa0e8dea9bc325ac2c57aaa540ce6 (patch)
tree6bf0bb46d390ca3185fe8491ff0470d3223ab6ba /synapse/handlers/auth.py
parentDon't warn user about password reset disabling through config code (#5387) (diff)
parent1.0.0rc3 (diff)
downloadsynapse-5bc94845378aa0e8dea9bc325ac2c57aaa540ce6.tar.xz
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers/auth.py')
-rw-r--r--synapse/handlers/auth.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py

index 7f8ddc99c6..a0cf37a9f9 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py
@@ -479,6 +479,7 @@ class AuthHandler(BaseHandler): medium, threepid_creds["client_secret"], sid=threepid_creds["sid"], + validated=True, ) threepid = {