diff options
author | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
---|---|---|
committer | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
commit | c042ffa460296587579aff54b157a5109e022f7e (patch) | |
tree | 9e7f77fbc83b6d06204db099066be8999dbb22d9 /config | |
parent | 9470564d355c201155f6fcb123152b8ac954f812 (diff) | |
parent | dccd95bc67779a5b83a2660aec0cf4622cd56550 (diff) | |
download | chat-c042ffa460296587579aff54b157a5109e022f7e.tar.gz chat-c042ffa460296587579aff54b157a5109e022f7e.tar.bz2 chat-c042ffa460296587579aff54b157a5109e022f7e.zip |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710
Diffstat (limited to 'config')
-rw-r--r-- | config/default.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json index a4487888e..cb60611ba 100644 --- a/config/default.json +++ b/config/default.json @@ -68,7 +68,8 @@ "ImageProxyURL": "", "EnableAPITeamDeletion": false, "ExperimentalEnableHardenedMode": false, - "ExperimentalLimitClientConfig": false + "ExperimentalLimitClientConfig": false, + "EnableEmailInvitations": false }, "TeamSettings": { "SiteName": "Mattermost", |