diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
| commit | 6e60768abe6f0caa639febf068d718d62881ce62 (patch) | |
| tree | 0600c72a7a9a3f7c1df167b3f870b38863e9a564 /utils | |
| parent | e22e7b8b7b66f342c2df693bbfc06a85980d253e (diff) | |
| parent | ac7918c5540900ab0dbe43d61b8c1155e4279b55 (diff) | |
| download | chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.gz chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.bz2 chat-6e60768abe6f0caa639febf068d718d62881ce62.zip | |
Fixing merge conflict
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index c2466800e..c42d5c9df 100644 --- a/utils/config.go +++ b/utils/config.go @@ -175,8 +175,10 @@ func getClientProperties(c *model.Config) map[string]string { props["SiteName"] = c.TeamSettings.SiteName props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider) + props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey props["GoogleDeveloperKey"] = c.ServiceSettings.GoogleDeveloperKey + props["EnableIncomingWebhooks"] = strconv.FormatBool(c.ServiceSettings.EnableIncomingWebhooks) props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications) props["EnableSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.EnableSignUpWithEmail) |