diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-18 09:19:53 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-18 09:19:53 -0700 |
| commit | 1aa4913c44ba9a342d240e5e1ca9d5e89929e499 (patch) | |
| tree | cc27224146e8c496e07c3aa4028f69c64d5b712b /docker | |
| parent | 60af1fad1f4f88dbfbda58336711d3184e57a1e4 (diff) | |
| parent | 6eb32591d978240fb77696f0b8697e81832883bb (diff) | |
| download | chat-1aa4913c44ba9a342d240e5e1ca9d5e89929e499.tar.gz chat-1aa4913c44ba9a342d240e5e1ca9d5e89929e499.tar.bz2 chat-1aa4913c44ba9a342d240e5e1ca9d5e89929e499.zip | |
fixing merge
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/0.6/config_docker.json | 6 | ||||
| -rw-r--r-- | docker/0.7/config_docker.json | 6 | ||||
| -rw-r--r-- | docker/dev/config_docker.json | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/docker/0.6/config_docker.json b/docker/0.6/config_docker.json index 157120b99..b1c72c4bd 100644 --- a/docker/0.6/config_docker.json +++ b/docker/0.6/config_docker.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : false, + "AllowTesting" : false, "UseSSL": false, "Port": "80", "Version": "developer", @@ -63,8 +63,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/0.7/config_docker.json b/docker/0.7/config_docker.json index 794ac95ae..cbac2ea69 100644 --- a/docker/0.7/config_docker.json +++ b/docker/0.7/config_docker.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : true, + "AllowTesting" : true, "UseSSL": false, "Port": "80", "Version": "developer", @@ -65,8 +65,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index bc42951b8..aceeb95b4 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -10,7 +10,7 @@ "ServiceSettings": { "SiteName": "Mattermost", "Mode" : "dev", - "AllowTesting" : true, + "AllowTesting" : true, "UseSSL": false, "Port": "80", "Version": "developer", @@ -66,8 +66,8 @@ "SMTPUsername": "", "SMTPPassword": "", "SMTPServer": "", - "UseTLS": false, - "UseStartTLS": false, + "UseTLS": false, + "UseStartTLS": false, "FeedbackEmail": "", "FeedbackName": "", "ApplePushServer": "", |