summaryrefslogtreecommitdiffstats
path: root/docker/local
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-09-30 19:30:45 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-09-30 19:30:45 +0500
commit296b93076888c9b26329938bd1cf1587397c7f51 (patch)
treea37a396752971c88e13fc97d88531357ca09542e /docker/local
parentfb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff)
parent13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff)
downloadchat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz
chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2
chat-296b93076888c9b26329938bd1cf1587397c7f51.zip
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'docker/local')
-rw-r--r--docker/local/config_docker.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index 06fee9bd5..0001eeb0a 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -5,7 +5,7 @@
"SegmentDeveloperKey": "",
"GoogleDeveloperKey": "",
"EnableOAuthServiceProvider": false,
- "EnableIncomingWebhooks": false,
+ "EnableIncomingWebhooks": true,
"EnableTesting": false
},
"TeamSettings": {
@@ -86,4 +86,4 @@
"TokenEndpoint": "",
"UserApiEndpoint": ""
}
-} \ No newline at end of file
+}