summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:09:50 -0700
committerReed Garmsen <rgarmsen2295@gmail.com>2015-06-17 11:09:50 -0700
commitf99ad06c19379a9279af0c260d9daceefc7fe944 (patch)
tree149d035c6a1be5cd96026c5ed4727084954334fc /config/config.json
parentcafbada5148546750ec50af8a5e754d22ebf5059 (diff)
parent8265b32b8bd0ccd7929c018eb162f5f059dd13d7 (diff)
downloadchat-f99ad06c19379a9279af0c260d9daceefc7fe944.tar.gz
chat-f99ad06c19379a9279af0c260d9daceefc7fe944.tar.bz2
chat-f99ad06c19379a9279af0c260d9daceefc7fe944.zip
Merge pull request #5 from mattermost/master
to me
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 3d2c26716..1b844c259 100644
--- a/config/config.json
+++ b/config/config.json
@@ -9,7 +9,7 @@
},
"ServiceSettings": {
"SiteName": "Mattermost Preview",
- "Domain": "",
+ "Domain": "xxxxxxmustbefilledin.com",
"Mode" : "dev",
"AllowTesting" : false,
"UseSSL": false,
@@ -56,7 +56,7 @@
"EmailSettings": {
"SMTPUsername": "",
"SMTPPassword": "",
- "SMTPServer": "localhost:25",
+ "SMTPServer": "",
"UseTLS": false,
"FeedbackEmail": "feedback@xxxxxxmustbefilledin.com",
"FeedbackName": "",