summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-05-04 06:31:42 -0700
committerChristopher Speller <crspeller@gmail.com>2016-05-04 09:31:42 -0400
commit6611229cd7bd3cdfc0082c0a581145aaac0ab322 (patch)
treedb6670a8c2716179bfe6e07b82588d83d3afb6bd /config
parent6b06f49e8910ed44f619adad15ab268758312852 (diff)
downloadchat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.tar.gz
chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.tar.bz2
chat-6611229cd7bd3cdfc0082c0a581145aaac0ab322.zip
PLT-2707 Adding option to show DM list from all of server (#2871)
* PLT-2707 Adding option to show DM list from all of server * Fixing loc
Diffstat (limited to 'config')
-rw-r--r--config/config.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.json b/config/config.json
index 3fe938fe2..b4fc84e0c 100644
--- a/config/config.json
+++ b/config/config.json
@@ -34,7 +34,8 @@
"RestrictCreationToDomains": "",
"RestrictTeamNames": true,
"EnableCustomBrand": false,
- "CustomBrandText": ""
+ "CustomBrandText": "",
+ "RestrictDirectMessage": "any"
},
"SqlSettings": {
"DriverName": "mysql",
@@ -155,4 +156,4 @@
"Directory": "./data/",
"EnableDaily": false
}
-} \ No newline at end of file
+}