diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
| commit | f19276f7bc5fa74dff749112fffd350dad662148 (patch) | |
| tree | cf0ff38b4f42f4a0272b402a07f3fd91c7cd4c69 /config | |
| parent | fbea02bebb561f7a76a876065066c9face6e484e (diff) | |
| parent | fe24aafe7d55044e8e03a6ca2fc116174966951e (diff) | |
| download | nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.tar.gz nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.zip | |
Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
config/config.sample.php
Diffstat (limited to 'config')
| -rwxr-xr-x | config/config.sample.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index d4cccd3443d..356843200b1 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -266,4 +266,7 @@ $CONFIG = array( /* all css and js files will be served by the web server statically in one js file and ons css file*/ 'asset-pipeline.enabled' => false, + + /* where mount.json file should be stored, defaults to data/mount.json */ + 'mount_file' => '', ); |