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
index.html
mod_supplier_proposal_marbre.php
mod_supplier_proposal_saphir.php
modules_supplier_proposal.php