summaryrefslogtreecommitdiffstats
path: root/docker/dev/config_docker.json
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-24 12:12:27 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-24 12:12:27 -0700
commit8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360 (patch)
treeb961f87c1bd9a2428eaee8b5ebd8c9fd1baf0fcc /docker/dev/config_docker.json
parenta374419ad5c5f35174ee6285b4eaa57ef82235bd (diff)
parentcaa157a3774ee86f0e7003ef4debc49bd88cb9f0 (diff)
downloadchat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.gz
chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.bz2
chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.zip
Fixing merge
Diffstat (limited to 'docker/dev/config_docker.json')
-rw-r--r--docker/dev/config_docker.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json
index 16a4007fa..06fee9bd5 100644
--- a/docker/dev/config_docker.json
+++ b/docker/dev/config_docker.json
@@ -11,7 +11,6 @@
"TeamSettings": {
"SiteName": "Mattermost",
"MaxUsersPerTeam": 50,
- "DefaultThemeColor": "#2389D7",
"EnableTeamCreation": true,
"EnableUserCreation": true,
"RestrictCreationToDomains": ""