Laurent Destailleur 930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/contact/list.php htdocs/core/lib/pdf.lib.php		2020-07-29 13:50:31 +02:00
..
api_shipments.class.php	FIX #13503	2020-04-13 14:55:37 +02:00
expedition.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-07-29 13:50:31 +02:00
expeditionbatch.class.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
expeditionstats.class.php	Merge branch 'develop' into 11.0_https	2019-10-01 06:11:43 +02:00
index.html