Laurent Destailleur 01209ff844 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/product/stock/card.php		2014-11-30 14:15:38 +01:00
..
cashdesk.php	Merge remote-tracking branch 'origin/3.7' into develop	2014-11-30 14:15:38 +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