summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-24 12:50:34 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-24 12:50:34 -0400
commit85ff151b71a5b0a488b7a8c3f0978b5d0ee8e280 (patch)
tree6db983637d72049797d3aea20b5dd01ec43a07df
parent1c7ff66d988dcff10f89779996813f02a3a67436 (diff)
parent22acb7b950c4fd6e1d9e8d31eff2dff44ffa97c5 (diff)
downloadchat-85ff151b71a5b0a488b7a8c3f0978b5d0ee8e280.tar.gz
chat-85ff151b71a5b0a488b7a8c3f0978b5d0ee8e280.tar.bz2
chat-85ff151b71a5b0a488b7a8c3f0978b5d0ee8e280.zip
Merge pull request #247 from nickago/MM-552
Mm 552 Enables email from a name instead of just an address
-rw-r--r--utils/mail.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/mail.go b/utils/mail.go
index 0fe7042b7..d152b2669 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -83,7 +83,7 @@ func SendMail(to, subject, body string) *model.AppError {
return nil
}
- fromMail := mail.Address{"", Cfg.EmailSettings.FeedbackEmail}
+ fromMail := mail.Address{Cfg.EmailSettings.FeedbackName, Cfg.EmailSettings.FeedbackEmail}
toMail := mail.Address{"", to}
headers := make(map[string]string)