Laurent Destailleur fd0eb47b35 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/card.php		2019-05-29 09:57:48 +02:00
..
import_csv.modules.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-05-29 09:57:48 +02:00
import_xlsx.modules.php	# WARNING: head commit changed in the meantime	2019-05-26 11:42:00 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
modules_import.php	replace @public by @var	2019-04-18 18:41:02 +02:00