summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-17 17:34:22 +0100
committerGitHub <noreply@github.com>2018-10-17 17:34:22 +0100
commitf1bfe6167a5640caaf2f85a96b87e327132f3906 (patch)
tree1c1620912f5bdec15bd4f1cc43fe47a66a231b72 /changelog.d
parentupdate changelog (diff)
parentPut the warning blob at the top of the file (diff)
downloadsynapse-f1bfe6167a5640caaf2f85a96b87e327132f3906.tar.xz
Merge pull request #4052 from matrix-org/rav/ship_resources_as_package_data
Ship the email templates as package_data
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4052.feature12
1 files changed, 12 insertions, 0 deletions
diff --git a/changelog.d/4052.feature b/changelog.d/4052.feature
new file mode 100644
index 0000000000..0c01f06880
--- /dev/null
+++ b/changelog.d/4052.feature
@@ -0,0 +1,12 @@
+Ship the example email templates as part of the package
+
+**Note**: if you deploy your Synapse instance from a git checkout or a github
+snapshot URL, then this means that the example email templates will no longer
+be installed in `res/templates`. If you have email notifications enabled, you
+should ensure that `email.template_dir` is either configured to point at a
+directory where you 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.
\ No newline at end of file