Laurent Destailleur 1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/fourn/class/fournisseur.product.class.php		2015-06-05 16:50:46 +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
linkedobjectblock.tpl.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-06-05 16:50:46 +02:00