diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 11:35:59 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 11:35:59 -0700 |
commit | 94c727a9c20e9fed0dab3d7e2688f9b96f0743e7 (patch) | |
tree | 422c7abe627630cb342c401c6c894ba6c12fa230 /config/config.json | |
parent | 8ae7afa5cc0119c7308aa87ce65c3c6c875da985 (diff) | |
parent | b7ada27c019598afe95ac4fb6b0a63f394510785 (diff) | |
download | chat-94c727a9c20e9fed0dab3d7e2688f9b96f0743e7.tar.gz chat-94c727a9c20e9fed0dab3d7e2688f9b96f0743e7.tar.bz2 chat-94c727a9c20e9fed0dab3d7e2688f9b96f0743e7.zip |
Merge pull request #9 from rgarmsen2295/master
to me
Diffstat (limited to 'config/config.json')
-rw-r--r-- | config/config.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json index a6c79efac..1b844c259 100644 --- a/config/config.json +++ b/config/config.json @@ -8,7 +8,7 @@ "FileLocation": "" }, "ServiceSettings": { - "SiteName": "XXXXXXMustBeFilledIn", + "SiteName": "Mattermost Preview", "Domain": "xxxxxxmustbefilledin.com", "Mode" : "dev", "AllowTesting" : false, @@ -57,6 +57,7 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", + "UseTLS": false, "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com", "FeedbackName": "", "ApplePushServer": "", |