Laurent Destailleur 58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php		2015-11-05 22:09:54 +01:00
..
expedition.class.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-11-05 22:09:54 +01:00
expeditionbatch.class.php	FIX: #3605 deleting a shipping	2015-10-14 12:16:54 +02:00
expeditionstats.class.php	Removed closing php tag	2014-05-03 18:18:44 +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