summary refs log tree commit diff
path: root/synapse/push/mailer.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-11 14:00:50 +0100
committerErik Johnston <erik@matrix.org>2019-06-11 14:00:50 +0100
commit03b09b32d6e368abe1ac0a5865d1be4fea7de787 (patch)
tree97311ef02ed7c2799fe77cf83b885be787313b4c /synapse/push/mailer.py
parentMerge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parentMerge pull request #5424 from matrix-org/erikj/change_password_reset_links (diff)
downloadsynapse-03b09b32d6e368abe1ac0a5865d1be4fea7de787.tar.xz
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/push/mailer.py')
-rw-r--r--synapse/push/mailer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py

index 4bc9eb7313..099f9545ab 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py
@@ -117,7 +117,7 @@ class Mailer(object): link = ( self.hs.config.public_baseurl + - "_synapse/password_reset/email/submit_token" + "_matrix/client/unstable/password_reset/email/submit_token" "?token=%s&client_secret=%s&sid=%s" % (token, client_secret, sid) )