diff options
| author | Erik Johnston <erik@matrix.org> | 2016-06-08 10:50:31 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-06-08 10:50:31 +0100 |
| commit | 5c7311515537832fcc462cc857316d62c36ee54d (patch) | |
| tree | 715ef91066fd1c785cab632257063365835c9b58 /synapse/push/mailer.py | |
| parent | Note that v0.15.x was never released (diff) | |
| parent | Merge pull request #850 from matrix-org/erikj/gc_threshold (diff) | |
| download | synapse-5c7311515537832fcc462cc857316d62c36ee54d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0
Diffstat (limited to 'synapse/push/mailer.py')
| -rw-r--r-- | synapse/push/mailer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index 88402e42a6..e5c3929cd7 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -186,7 +186,7 @@ class Mailer(object): multipart_msg = MIMEMultipart('alternative') multipart_msg['Subject'] = "[%s] %s" % (self.app_name, summary_text) - multipart_msg['From'] = self.hs.config.email_notif_from + multipart_msg['From'] = from_string multipart_msg['To'] = email_address multipart_msg['Date'] = email.utils.formatdate() multipart_msg['Message-ID'] = email.utils.make_msgid() |