Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts: htdocs/core/lib/functions.lib.php
2019-12-09 13:25:23 +01:00 · 2019-12-09 13:25:23 +01:00 · f2c7d3de2e
commit f2c7d3de2e
parent 13acb8537d 5dbf060f00
1 changed files with 1 additions and 0 deletions
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@ -1425,6 +1425,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 					$fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
 					$relativepathimage = $relativepath.'_preview.png';

+
 					// Si fichier PDF existe
 					if (file_exists($file))
 					{