Laurent Destailleur 5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of ... https://github.com/atm-alexis/dolibarr into atm-alexis-develop_NEW_decrease_stock_expedition_classify Conflicts: htdocs/expedition/class/expedition.class.php		2016-06-02 11:23:49 +02:00
..
expedition.class.php	Merge branch 'develop_NEW_decrease_stock_expedition_classify' of	2016-06-02 11:23:49 +02:00
expeditionbatch.class.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-10-16 10:12:36 +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