diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 07:54:30 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-17 07:54:30 -0700 |
commit | cafbada5148546750ec50af8a5e754d22ebf5059 (patch) | |
tree | 948d72720cca1a486c0e13d9b3b5c8597027451d /config/config.json | |
parent | a7ed61ef90492dee7f9825b5563ed575d4f60c77 (diff) | |
parent | 5a8f8397167cec8cba29b70bb7dbdda9ba0265f7 (diff) | |
download | chat-cafbada5148546750ec50af8a5e754d22ebf5059.tar.gz chat-cafbada5148546750ec50af8a5e754d22ebf5059.tar.bz2 chat-cafbada5148546750ec50af8a5e754d22ebf5059.zip |
Merge pull request #3 from mattermost/master
to me
Diffstat (limited to 'config/config.json')
-rw-r--r-- | config/config.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json index a6c79efac..3d2c26716 100644 --- a/config/config.json +++ b/config/config.json @@ -8,8 +8,8 @@ "FileLocation": "" }, "ServiceSettings": { - "SiteName": "XXXXXXMustBeFilledIn", - "Domain": "xxxxxxmustbefilledin.com", + "SiteName": "Mattermost Preview", + "Domain": "", "Mode" : "dev", "AllowTesting" : false, "UseSSL": false, @@ -56,7 +56,8 @@ "EmailSettings": { "SMTPUsername": "", "SMTPPassword": "", - "SMTPServer": "", + "SMTPServer": "localhost:25", + "UseTLS": false, "FeedbackEmail": "feedback@xxxxxxmustbefilledin.com", "FeedbackName": "", "ApplePushServer": "", |