Laurent Destailleur c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/fiche-rec.php htdocs/core/class/commonobject.class.php htdocs/core/modules/import/import_xlsx.modules.php htdocs/install/repair.php		2017-11-14 19:47:33 +01:00
..
import_csv.modules.php	Code comment	2017-11-06 11:32:02 +01:00
import_xlsx.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-11-14 19:47:33 +01: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	Try to correct travis public underscore problem	2016-12-19 06:34:17 +01:00