Laurent Destailleur 803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/compta/facture.php htdocs/core/modules/expedition/doc/pdf_rouget.modules.php htdocs/filefunc.inc.php		2016-08-01 15:01:14 +02: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 3.9	2016-08-01 15:01:14 +02:00
pdf_rouget.modules.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-08-01 15:01:14 +02:00