summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-22 15:47:57 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-22 15:47:57 -0400
commitac7918c5540900ab0dbe43d61b8c1155e4279b55 (patch)
tree2e519e101e995d24d656d7cf1f7a9d404303a364 /config
parenta44e8f0cd904d386caea410398dcaf7dbfd9c138 (diff)
parent98186e5018bbc604796d4f9762c93f4f75e2913f (diff)
downloadchat-ac7918c5540900ab0dbe43d61b8c1155e4279b55.tar.gz
chat-ac7918c5540900ab0dbe43d61b8c1155e4279b55.tar.bz2
chat-ac7918c5540900ab0dbe43d61b8c1155e4279b55.zip
Merge pull request #715 from mattermost/plt-27
PLT-27 Implement incoming webhooks.
Diffstat (limited to 'config')
-rw-r--r--config/config.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.json b/config/config.json
index 38948641c..c573a299f 100644
--- a/config/config.json
+++ b/config/config.json
@@ -22,7 +22,8 @@
"StorageDirectory": "./data/",
"AllowedLoginAttempts": 10,
"DisableEmailSignUp": false,
- "EnableOAuthServiceProvider": false
+ "EnableOAuthServiceProvider": false,
+ "AllowIncomingWebhooks": false
},
"SqlSettings": {
"DriverName": "mysql",