summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorasaadmahmoodspin <asaad@battlehouse.com>2015-06-19 19:52:04 +0500
committerasaadmahmoodspin <asaad@battlehouse.com>2015-06-19 19:52:04 +0500
commit20676fd740781e3b818b7411be17ec6f4f67bc3f (patch)
tree059988228781471d43fd212525cb3bd53de0e040 /config/config.json
parent0821b51f4ee5fcc2eadc2c92c60ebbb4fdc084d3 (diff)
parent32025e43799324523988af040085d95ec6b6e80e (diff)
downloadchat-20676fd740781e3b818b7411be17ec6f4f67bc3f.tar.gz
chat-20676fd740781e3b818b7411be17ec6f4f67bc3f.tar.bz2
chat-20676fd740781e3b818b7411be17ec6f4f67bc3f.zip
Merge pull request #1 from rgarmsen2295/mm-1253
MM-1253
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json3
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": "",