Laurent Destailleur f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php

2019-09-27 14:11:14 +02:00

..

api_shipments.class.php

Replace deprecated code

2019-09-06 10:53:05 +02:00

expedition.class.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

2019-09-27 14:11:14 +02:00

expeditionbatch.class.php

wip

2019-02-24 23:32:09 +01:00

expeditionstats.class.php

Typo abscissa

2019-09-23 21:45:23 +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