# WARNING: head commit changed in the meantime

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
This commit is contained in:
Laurent Destailleur
2022-02-04 15:40:28 +01:00
9 changed files with 35 additions and 8 deletions

View File

@@ -9360,7 +9360,7 @@ function dolIsAllowedForPreview($file)
/**
* Return mime type of a file
* Return MIME type of a file from its name with extension.
*
* @param string $file Filename we looking for MIME type
* @param string $default Default mime type if extension not found in known list