summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-08-25 10:24:52 -0400
committerGitHub <noreply@github.com>2017-08-25 10:24:52 -0400
commit086365fb84e1d8096993756b79558bc204b1df2e (patch)
tree566396508513df8b09de521a533d0331fd18efbd /config
parenta360ac6dbdf3d2487d12bc4435624a5227aeb845 (diff)
downloadchat-086365fb84e1d8096993756b79558bc204b1df2e.tar.gz
chat-086365fb84e1d8096993756b79558bc204b1df2e.tar.bz2
chat-086365fb84e1d8096993756b79558bc204b1df2e.zip
PLT-7417/PLT-7425 (#7278)
PLT-7417/PLT-7425 Update config.json defaults and removed admin console link settings
Diffstat (limited to 'config')
-rw-r--r--config/default.json8
1 files changed, 3 insertions, 5 deletions
diff --git a/config/default.json b/config/default.json
index e7e67855a..7f03e035b 100644
--- a/config/default.json
+++ b/config/default.json
@@ -120,7 +120,8 @@
"AmazonS3Region": "us-east-1",
"AmazonS3Endpoint": "s3.amazonaws.com",
"AmazonS3SSL": true,
- "AmazonS3SignV2": false
+ "AmazonS3SignV2": false,
+ "AmazonS3SSE": false
},
"EmailSettings": {
"EnableSignUpWithEmail": true,
@@ -165,9 +166,6 @@
"AboutLink": "https://about.mattermost.com/default-about/",
"HelpLink": "https://about.mattermost.com/default-help/",
"ReportAProblemLink": "https://about.mattermost.com/default-report-a-problem/",
- "AdministratorsGuideLink": "https://about.mattermost.com/administrators-guide/",
- "TroubleshootingForumLink": "https://about.mattermost.com/troubleshooting-forum/",
- "CommercialSupportLink": "https://about.mattermost.com/commercial-support/",
"SupportEmail": "feedback@mattermost.com"
},
"AnnouncementSettings": {
@@ -310,4 +308,4 @@
"PluginSettings": {
"Plugins": {}
}
-} \ No newline at end of file
+}