summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-08-15 16:27:11 +0100
committerGitHub <noreply@github.com>2019-08-15 16:27:11 +0100
commitb13cac896d4f9bfd946517e96676394e2975e54b (patch)
tree25883b13d5b1690d3b4059f906fc9349e09bcc80 /changelog.d
parentMerge branch 'master' into develop (diff)
downloadsynapse-b13cac896d4f9bfd946517e96676394e2975e54b.tar.xz
Fix up password reset template config names (#5863)
Fixes #5833

The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/5863.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/5863.bugfix b/changelog.d/5863.bugfix
new file mode 100644
index 0000000000..bceae5be67
--- /dev/null
+++ b/changelog.d/5863.bugfix
@@ -0,0 +1 @@
+Fix Synapse looking for config options `password_reset_failure_template` and `password_reset_success_template`, when they are actually `password_reset_template_failure_html`, `password_reset_template_success_html`.