summary refs log tree commit diff
path: root/synapse/config/emailconfig.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2016-06-03 12:15:01 +0100
committerMatthew Hodgson <matthew@arasphere.net>2016-06-03 12:15:01 +0100
commitaa6fab0cc2c875f1a692c3dd83f62a7f81dbefd8 (patch)
tree5034a5aba0c6e604683080357ae6481803a4dea1 /synapse/config/emailconfig.py
parentMerge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into develop (diff)
parentMerge branch 'develop' into matthew/brand-from-header (diff)
downloadsynapse-aa6fab0cc2c875f1a692c3dd83f62a7f81dbefd8.tar.xz
Merge pull request #822 from matrix-org/matthew/brand-from-header
brand the email from header
Diffstat (limited to 'synapse/config/emailconfig.py')
-rw-r--r--synapse/config/emailconfig.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py

index 90bdd08f00..a187161272 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py
@@ -89,7 +89,7 @@ class EmailConfig(Config): # enable_notifs: false # smtp_host: "localhost" # smtp_port: 25 - # notif_from: Your Friendly Matrix Home Server <noreply@example.com> + # notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>" # app_name: Matrix # template_dir: res/templates # notif_template_html: notif_mail.html