diff options
author | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-10-19 15:48:59 +0100 |
commit | 056f0991262902e22f0414e17c01198e1606384a (patch) | |
tree | fa365dc1aef28f86499122d8b9176c03dd95e863 /docker | |
parent | Batch process handling state groups (diff) | |
parent | Fix manhole on py3 (pt 2) (#4067) (diff) | |
download | synapse-056f0991262902e22f0414e17c01198e1606384a.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/purge_state_groups
Diffstat (limited to 'docker')
-rw-r--r-- | docker/conf/homeserver.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml index cfe88788f2..a38b929f50 100644 --- a/docker/conf/homeserver.yaml +++ b/docker/conf/homeserver.yaml @@ -211,7 +211,9 @@ email: require_transport_security: False notif_from: "{{ SYNAPSE_SMTP_FROM or "hostmaster@" + SYNAPSE_SERVER_NAME }}" app_name: Matrix - template_dir: res/templates + # if template_dir is unset, uses the example templates that are part of + # the Synapse distribution. + #template_dir: res/templates notif_template_html: notif_mail.html notif_template_text: notif_mail.txt notif_for_new_users: True |