Laurent Destailleur 37b0780523 Merge remote-tracking branch 'origin/3.4' into 3.5 ... Conflicts: ChangeLog htdocs/comm/propal.php htdocs/ecm/tpl/builddatabase.tpl.php htdocs/fourn/commande/liste.php htdocs/product/admin/product_tools.php		2013-12-08 00:42:36 +01:00
..
ecmdirectory.class.php	Merge remote-tracking branch 'origin/3.4' into 3.5	2013-12-08 00:42:36 +01:00
htmlecm.form.class.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00