summary refs log tree commit diff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-11-27 14:04:22 -0700
committerTravis Ralston <travpc@gmail.com>2018-11-27 14:04:22 -0700
commitbc50cffa2698a484dffda0e1f64c832132b1ff48 (patch)
tree401ed265c319a277506cb4ddfe9c12bbcb0d4716 /synapse/handlers/auth.py
parentMore timeout (diff)
parentSupport m.login.sso (#4220) (diff)
downloadsynapse-travis/intentional-timeout.tar.xz
Merge branch 'develop' into travis/intentional-timeout github/travis/intentional-timeout travis/intentional-timeout
Diffstat (limited to '')
-rw-r--r--synapse/handlers/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py

index a958c45271..c6e89db4bc 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py
@@ -473,7 +473,7 @@ class AuthHandler(BaseHandler): "version": self.hs.config.user_consent_version, "en": { "name": self.hs.config.user_consent_policy_name, - "url": "%s/_matrix/consent?v=%s" % ( + "url": "%s_matrix/consent?v=%s" % ( self.hs.config.public_baseurl, self.hs.config.user_consent_version, ),