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 | 8e65f38979696df993c15a5c3752f4bba91a0978 (patch) | |
| tree | 7ca8cb11aed7753b04d84fedfe0630879c30a069 /config/config.json | |
| parent | 9e0d4f70e01ecf8f157fed6e6145284c202bc44a (diff) | |
| parent | 0d6ed4a6ab14c4fc4bbdf4bd0b63c19d896a7b48 (diff) | |
| download | chat-8e65f38979696df993c15a5c3752f4bba91a0978.tar.gz chat-8e65f38979696df993c15a5c3752f4bba91a0978.tar.bz2 chat-8e65f38979696df993c15a5c3752f4bba91a0978.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": "", |