diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-03 14:51:33 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-06-03 14:51:33 +0100 |
| commit | dd6f62ed99033d7c793685b6cce5dfba9d3aff89 (patch) | |
| tree | 0044c60b4100253a0875be891bbb4ecfce80d47c /synapse/config | |
| parent | Send updates to the syncing users every ten seconds or immediately if they've... (diff) | |
| parent | Merge pull request #833 from matrix-org/markjh/client_ips (diff) | |
| download | synapse-dd6f62ed99033d7c793685b6cce5dfba9d3aff89.tar.xz | |
Merge branch 'develop' into markjh/synchrotronII
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/emailconfig.py | 2 |
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 |