Laurent Destailleur 9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php		2016-09-12 02:05:38 +02:00
..
cronjob.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-12 02:05:38 +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