Laurent Destailleur fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ...

Conflicts:
	htdocs/filefunc.inc.php

2019-02-08 10:44:45 +01:00

..

api_shipments.class.php

Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose

2018-10-24 23:04:26 +02:00

expedition.class.php

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

2019-02-08 10:44:45 +01:00

expeditionbatch.class.php

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

2018-10-24 03:35:44 +02:00

expeditionstats.class.php

FIX change my deprecated email

2018-10-27 14:43:12 +02:00

index.html

…