diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
| commit | 6e60768abe6f0caa639febf068d718d62881ce62 (patch) | |
| tree | 0600c72a7a9a3f7c1df167b3f870b38863e9a564 /docker | |
| parent | e22e7b8b7b66f342c2df693bbfc06a85980d253e (diff) | |
| parent | ac7918c5540900ab0dbe43d61b8c1155e4279b55 (diff) | |
| download | chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.gz chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.bz2 chat-6e60768abe6f0caa639febf068d718d62881ce62.zip | |
Fixing merge conflict
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dev/config_docker.json | 3 | ||||
| -rw-r--r-- | docker/local/config_docker.json | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index 8bd5f1b0a..4a1be4ed3 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -5,7 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableTesting": false + "EnableTesting": false, + "EnableIncomingWebhooks": false }, "TeamSettings": { "SiteName": "Mattermost", diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index 8bd5f1b0a..4a1be4ed3 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -5,7 +5,8 @@ "SegmentDeveloperKey": "", "GoogleDeveloperKey": "", "EnableOAuthServiceProvider": false, - "EnableTesting": false + "EnableTesting": false, + "EnableIncomingWebhooks": false }, "TeamSettings": { "SiteName": "Mattermost", |