Laurent Destailleur 3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php htdocs/product/document.php htdocs/societe/commerciaux.php		2016-03-10 15:03:53 +01:00
..
doc_generic_shipment_odt.modules.php	FIX The part added with hidden option MAIN_DOC_USE_TIMING was included	2016-03-06 00:39:13 +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
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