summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-17 17:40:01 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-17 17:40:01 +0100
commit52e3d3813baf82dc16aae42bdd108cf296c3ead7 (patch)
tree927b0817d7532b9fe8b6ca8f66e1d47dcd923edb /CHANGES.md
parentFix incorrect truncation in get_missing_events (diff)
downloadsynapse-52e3d3813baf82dc16aae42bdd108cf296c3ead7.tar.xz
prep changelog
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md25
1 files changed, 25 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 6c80a86461..2598bfc333 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,28 @@
+Synapse 0.33.7rc2 (2018-10-17)
+==============================
+
+**Warning**: This release removes the example email notification templates from `res/templates` (they are now internal to the python package). This should only affect you if you (a) deploy your Synapse instance from a git checkout or a github snapshot URL, and (b) have email notifications enabled.
+
+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.
+
+Features
+--------
+
+- Ship the example email templates as part of the package ([\#4052](https://github.com/matrix-org/synapse/issues/4052))
+
+Bugfixes
+--------
+
+- Fix bug which made get_missing_events return too few events ([\#4045](https://github.com/matrix-org/synapse/issues/4045))
+
+
 Synapse 0.33.7rc1 (2018-10-15)
 ==============================