summary refs log tree commit diff
path: root/synapse/handlers/auth.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-11-20 11:03:35 +0000
committerRichard van der Hoff <richard@matrix.org>2018-11-20 11:03:35 +0000
commit28e28a1974d89fc3cdf06cae36a3ebc16e2ff504 (patch)
treefebd9f48f5212fd0762f8f72bbbf28c954905fbe /synapse/handlers/auth.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge remote-tracking branch 'origin/master' into develop (diff)
downloadsynapse-28e28a1974d89fc3cdf06cae36a3ebc16e2ff504.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/auth.py')
-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, ),