diff options
author | Lukas Reschke <lukas@owncloud.com> | 2014-09-23 14:48:16 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-23 14:48:16 +0200 |
commit | 734112a5c1ac813437966588615dc84bbddfcfc7 (patch) | |
tree | 2a8feaf95d36b31c164c6ed27bdc221e9c56dae4 /config/config.sample.php | |
parent | bb69eebde4e03b2672c99827d4ad5339ba432a85 (diff) | |
parent | a6eb6383803f502bb046a239845c04e8afd728b0 (diff) | |
download | nextcloud-server-734112a5c1ac813437966588615dc84bbddfcfc7.tar.gz nextcloud-server-734112a5c1ac813437966588615dc84bbddfcfc7.zip |
Merge branch 'stable7' into backport-11211
Conflicts:
config/config.sample.php
Diffstat (limited to 'config/config.sample.php')
-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 0a933b1ae5f..c041f4e62fa 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -269,7 +269,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 * |