diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-23 16:49:53 +0400 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-23 16:49:53 +0400 |
| commit | 716613fda4493770fe77510ef182dd0511643200 (patch) | |
| tree | 49d9bcd5b401b4992a1077252ce7631428e397ca /config | |
| parent | 77a4b1609bd80b29d0b90e8430fad853b2bee0be (diff) | |
| parent | f2629142b07a38b11869116750177cd316da6064 (diff) | |
Merge branch 'stable6' into backport-11211-stable6
Conflicts:
config/config.sample.php
Diffstat (limited to 'config')
| -rwxr-xr-x | config/config.sample.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index dfb7a227404..fda536fab6e 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -242,7 +242,7 @@ $CONFIG = array( /* custom path for libreoffice / openoffice binary */ 'preview_libreoffice_path' => '/usr/bin/libreoffice', /* cl parameters for libreoffice / openoffice */ -'preview_office_cl_parameters' => '', +'preview_office_cl_parameters' => ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ', /** * Only register providers that have been explicitly enabled * |