diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-12-06 18:27:46 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-12-06 18:27:46 +0100 |
| commit | 9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc (patch) | |
| tree | 082f05cc105e5540c6ef642d9b3d6daaa64fd749 /config | |
| parent | e888bdda30589d4d8c20bca3c1f962436794bf10 (diff) | |
| parent | b5939324b0053b6447423ebc8b269e9f773f7f02 (diff) | |
| download | nextcloud-server-9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc.tar.gz nextcloud-server-9eca2471b3e8b75c21a1a8fd2a88c20c577c07bc.zip | |
Merge branch 'master' into backgroundscan-reuse-etag
Diffstat (limited to 'config')
| -rwxr-xr-x | config/config.sample.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 7b533a8b9ce..ba068968323 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -117,6 +117,9 @@ $CONFIG = array( /* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */ 'trashbin_retention_obligation' => 30, +/* Disable/Enable auto expire for the trash bin, by default auto expire is enabled */ +'trashbin_auto_expire' => true, + /* allow user to change his display name, if it is supported by the back-end */ 'allow_user_to_change_display_name' => true, @@ -185,8 +188,8 @@ $CONFIG = array( // "datadirectory" => "", /* Enable maintenance mode to disable ownCloud - If you want to prevent users to login to ownCloud before you start doing some maintenance work, - you need to set the value of the maintenance parameter to true. + If you want to prevent users to login to ownCloud before you start doing some maintenance work, + you need to set the value of the maintenance parameter to true. Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly. */ "maintenance" => false, |