Laurent Destailleur f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: .travis.yml htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php htdocs/core/modules/commande/doc/pdf_proforma.modules.php htdocs/includes/adodbtime/adodb-time.inc.php htdocs/langs/en_US/accountancy.lang		2015-12-18 22:12:03 +01:00
..
doc_generic_shipment_odt.modules.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +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_merou.modules.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-18 22:12:03 +01:00
pdf_rouget.modules.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-18 22:12:03 +01:00