Laurent Destailleur 7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/adherents/type.php htdocs/categories/class/categorie.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/extrafields.class.php htdocs/core/lib/tax.lib.php htdocs/product/composition/card.php		2015-10-10 18:56:28 +02:00
..
contrat.class.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-10-10 18:56:28 +02:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00