Laurent Destailleur 2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/langs/en_US/admin.lang htdocs/product/dynamic_price/class/price_parser.class.php		2019-08-10 01:20:17 +02:00
..
doc_generic_order_odt.modules.php	update code	2019-04-09 09:19:16 +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
pdf_einstein.modules.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-08-10 01:20:17 +02:00
pdf_eratosthene.modules.php	FIX #11553	2019-07-25 18:17:17 +02:00
pdf_proforma.modules.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0	2019-08-10 01:20:17 +02:00