Laurent Destailleur 93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php		2015-11-13 12:18:46 +01:00
..
expedition.class.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-11-13 12:18:46 +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