Laurent Destailleur 96b6f0d8fb Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: composer.json htdocs/product/ajax/products.php htdocs/product/class/product.class.php		2015-12-21 12:24:24 +01: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
products.php	Merge remote-tracking branch 'origin/3.6' into 3.7	2015-12-21 12:24:24 +01:00