diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-06-03 16:54:29 +0100 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-06-03 16:54:29 +0100 |
| commit | 81d226888fcb4dd3e760bf9402551ad4c5f32f75 (patch) | |
| tree | f923070e095f216b1c13f10ce1c6a22b4c8e9e48 /synapse | |
| parent | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop (diff) | |
| parent | 3rd time lucky: we'd already calculated it above (diff) | |
| download | synapse-81d226888fcb4dd3e760bf9402551ad4c5f32f75.tar.xz | |
Merge pull request #834 from matrix-org/dbkr/fix_email_from
Fix email notif From
Diffstat (limited to 'synapse')
| -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() |