Laurent Destailleur 8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/core/tpl/objectline_edit.tpl.php htdocs/fourn/class/fournisseur.product.class.php htdocs/fourn/facture/card.php htdocs/product/composition/card.php		2016-04-12 15:00:02 +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
margins.lib.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2016-04-12 15:00:02 +02:00