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
commitf34074a45595a9b4d0a66acd656fe0146a8781cf (patch)
treede63276a966ebf3e0bf722995519f65dc8ce7581 /config/config.json
parent8e65f38979696df993c15a5c3752f4bba91a0978 (diff)
parent6016a98ea3371755c93de054ca7fa0e553f94f78 (diff)
downloadchat-f34074a45595a9b4d0a66acd656fe0146a8781cf.tar.gz
chat-f34074a45595a9b4d0a66acd656fe0146a8781cf.tar.bz2
chat-f34074a45595a9b4d0a66acd656fe0146a8781cf.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": "",