Laurent Destailleur df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fichinter/fiche.php		2014-11-28 02:20:01 +01:00
..
doc_generic_shipment_odt.modules.php
index.html
pdf_merou.modules.php
pdf_rouget.modules.php