Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expedition/modules_expedition.php htdocs/core/modules/modContrat.class.php htdocs/expedition/class/expedition.class.php		2015-05-07 13:35:09 +02:00
..
doc_generic_proposal_odt.modules.php	Fix: Bad parameter of get_substitutionarray_other	2014-10-15 18:16:41 +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_azur.modules.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-07 13:35:09 +02:00