diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-12 14:22:05 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-12 14:22:05 -0700 |
| commit | 191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6 (patch) | |
| tree | 63378d3100f0a70806767c87886b3e0b9037f8c5 /config/config.json | |
| parent | 246c7414bd2f22a3440af5df7d72f33e7207dc50 (diff) | |
| parent | a6a3c351a828441313e90c1ac8e6afbfadad1f7c (diff) | |
| download | chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.gz chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.tar.bz2 chat-191e248b0fbe833c0c52e1e6145f4d19b4c3a7b6.zip | |
Merge pull request #1022 from mattermost/release-1.1.0
Release 1.1.0rc merging to master
Diffstat (limited to 'config/config.json')
| -rw-r--r-- | config/config.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/config.json b/config/config.json index 919737da7..8ef151350 100644 --- a/config/config.json +++ b/config/config.json @@ -8,7 +8,8 @@ "EnableIncomingWebhooks": true, "EnablePostUsernameOverride": false, "EnablePostIconOverride": false, - "EnableTesting": false + "EnableTesting": false, + "EnableSecurityFixAlert": true }, "TeamSettings": { "SiteName": "Mattermost", @@ -77,8 +78,7 @@ }, "PrivacySettings": { "ShowEmailAddress": true, - "ShowFullName": true, - "EnableSecurityFixAlert": true + "ShowFullName": true }, "GitLabSettings": { "Enable": false, |