summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-19 21:37:32 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-19 21:37:32 +0100
commit81d4f51524a735cbcafd6c9daeca2178f8145cf9 (patch)
treeb5090f37022bf4484dd26ca8d118391296e10e39
parentMerge pull request #4069 from matrix-org/rav/fix_email_templates_4065 (diff)
parentRemove notes on fallback for email_templates (diff)
downloadsynapse-81d4f51524a735cbcafd6c9daeca2178f8145cf9.tar.xz
Merge branch 'rav/fix_email_templates_4065' into develop
-rw-r--r--CHANGES.md4
-rw-r--r--UPGRADE.rst4
2 files changed, 0 insertions, 8 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 5f598559a0..fb98c934c0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,10 +11,6 @@ If you have email notifications enabled, you should ensure that
 have installed customised templates, or leave it unset to use the default
 templates.
 
-The configuration parser will try to detect the situation where
-`email.template_dir` is incorrectly set to `res/templates` and do the right
-thing, but will warn about this.
-
 Synapse 0.33.7rc2 (2018-10-17)
 ==============================
 
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 201d298123..55c77eedde 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -61,10 +61,6 @@ If you have email notifications enabled, you should ensure that
 have installed customised templates, or leave it unset to use the default
 templates.
 
-The configuration parser will try to detect the situation where
-``email.template_dir`` is incorrectly set to ``res/templates`` and do the right
-thing, but will warn about this.
-
 Upgrading to v0.27.3
 ====================