Skip to content
Snippets Groups Projects
Commit e6f294d1 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
parents 3f69b1fd 427f656b
No related branches found
No related tags found
No related merge requests found
......@@ -1968,7 +1968,7 @@ function dol_check_secure_access_document($modulepart,$original_file,$entity,$fu
}
/**
* Store object in file
* Store object in file.
*
* @param string $directory Directory of cache
* @param string $filename Name of filecache
......@@ -1984,7 +1984,7 @@ function dol_filecache($directory, $filename, $object)
}
/**
* Test if Refresh needed
* Test if Refresh needed.
*
* @param string $directory Directory of cache
* @param string $filename Name of filecache
......@@ -2000,7 +2000,7 @@ function dol_cache_refresh($directory, $filename, $cachetime)
}
/**
* Read object from cachefile
* Read object from cachefile.
*
* @param string $directory Directory of cache
* @param string $filename Name of filecache
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment