Laurent Destailleur 23562a01ab Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/install/mysql/migration/3.6.0-3.7.0.sql htdocs/langs/en_US/stocks.lang		2015-02-16 20:59:04 +01:00
..
expedition.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-16 20:59:04 +01:00
expeditionbatch.class.php	Debug serial/lot management	2015-02-16 20:14:16 +01: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