summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2015-12-14 19:04:08 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2015-12-14 19:04:08 +0500
commit3d8d152aa0d84d1150ee0a174641c0a4697307f1 (patch)
treebdcdc81111fd7c8f2b3dd912402006b2d66b50cf /docker
parentdef79636f8e41204c32bf4b628b254aec5377ef5 (diff)
parentb9a4966e7d287ddaa16ccd7d553e2ada13edc289 (diff)
downloadchat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.tar.gz
chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.tar.bz2
chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.zip
Merge branch 'master' of https://github.com/mattermost/platform into code-themes
Diffstat (limited to 'docker')
-rw-r--r--docker/dev/config_docker.json8
-rw-r--r--docker/local/config_docker.json8
2 files changed, 16 insertions, 0 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index a35abb9da..ab1373a44 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -82,6 +82,14 @@
"ShowEmailAddress": true,
"ShowFullName": true
},
+ "SupportSettings": {
+ "TermsOfServiceLink": "/static/help/terms.html",
+ "PrivacyPolicyLink": "/static/help/privacy.html",
+ "AboutLink": "/static/help/about.html",
+ "HelpLink": "/static/help/help.html",
+ "ReportAProblemLink": "/static/help/report_problem.html",
+ "SupportEmail": "feedback@mattermost.com"
+ },
"GitLabSettings": {
"Enable": false,
"Secret": "",
diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json
index a35abb9da..ab1373a44 100644
--- a/docker/local/config_docker.json
+++ b/docker/local/config_docker.json
@@ -82,6 +82,14 @@
"ShowEmailAddress": true,
"ShowFullName": true
},
+ "SupportSettings": {
+ "TermsOfServiceLink": "/static/help/terms.html",
+ "PrivacyPolicyLink": "/static/help/privacy.html",
+ "AboutLink": "/static/help/about.html",
+ "HelpLink": "/static/help/help.html",
+ "ReportAProblemLink": "/static/help/report_problem.html",
+ "SupportEmail": "feedback@mattermost.com"
+ },
"GitLabSettings": {
"Enable": false,
"Secret": "",