Laurent Destailleur 8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php htdocs/product/stats/facture.php		2019-08-10 01:57:43 +02:00
..
class	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-29 11:07:11 +02:00
card.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-08-10 01:57:43 +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