summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-16 16:32:27 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-16 16:32:27 -0400
commite644b53b72d346539f5c58cc0cb0a07c4054cbcb (patch)
tree0ebc1eb62d16d9cef5d1591339ebf0a4176cb89d /utils
parent720f1082d3e9456192bcab4050a82ff56845ed7f (diff)
parentc60e687c6bac4acdbaa15281de1f7ab6750120a4 (diff)
downloadchat-e644b53b72d346539f5c58cc0cb0a07c4054cbcb.tar.gz
chat-e644b53b72d346539f5c58cc0cb0a07c4054cbcb.tar.bz2
chat-e644b53b72d346539f5c58cc0cb0a07c4054cbcb.zip
Merge pull request #697 from mattermost/PLT-93
PLT-93 Fixing broken email templates
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go
index 212a1a559..0eb8329d1 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -278,6 +278,7 @@ func getClientProperties(c *Config) map[string]string {
props["Version"] = c.ServiceSettings.Version
props["SiteName"] = c.ServiceSettings.SiteName
props["ByPassEmail"] = strconv.FormatBool(c.EmailSettings.ByPassEmail)
+ props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail
props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress)
props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink)
props["SegmentDeveloperKey"] = c.ClientSettings.SegmentDeveloperKey