diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-23 14:38:34 -0700 |
commit | 7f3bfdbe0c2442714bb5a14adfdeac1576123601 (patch) | |
tree | 44962a914b86cf66a1da49300f12986db49f010e /docker | |
parent | 1626a6de6f16ba0878160b0a7eae9f49b8d34d4f (diff) | |
parent | c7c644874e98db0ae83c5a44ec50ff811d9b3f46 (diff) | |
download | chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.gz chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.tar.bz2 chat-7f3bfdbe0c2442714bb5a14adfdeac1576123601.zip |
Fixing merge
Diffstat (limited to 'docker')
-rw-r--r-- | docker/dev/config_docker.json | 2 | ||||
-rw-r--r-- | docker/local/config_docker.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/dev/config_docker.json b/docker/dev/config_docker.json index e33396214..16a4007fa 100644 --- a/docker/dev/config_docker.json +++ b/docker/dev/config_docker.json @@ -33,7 +33,7 @@ "FileFormat": "", "FileLocation": "" }, - "ImageSettings": { + "FileSettings": { "DriverName": "local", "Directory": "/mattermost/data/", "EnablePublicLink": true, diff --git a/docker/local/config_docker.json b/docker/local/config_docker.json index e33396214..16a4007fa 100644 --- a/docker/local/config_docker.json +++ b/docker/local/config_docker.json @@ -33,7 +33,7 @@ "FileFormat": "", "FileLocation": "" }, - "ImageSettings": { + "FileSettings": { "DriverName": "local", "Directory": "/mattermost/data/", "EnablePublicLink": true, |