rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rav/fix_email_templates_4065' into develop

This commit is contained in:
Richard van der Hoff 2018-10-19 21:37:32 +01:00
parent f62c597d14 593389a077
commit 81d4f51524
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -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 have installed customised templates, or leave it unset to use the default
templates. 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) Synapse 0.33.7rc2 (2018-10-17)
============================== ==============================

4
UPGRADE.rst
View File

@ -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 have installed customised templates, or leave it unset to use the default
templates. 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 Upgrading to v0.27.3
==================== ====================