Laurent Destailleur 3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 ...

Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php

2016-04-29 20:42:35 +02:00

..

expedition.class.php

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-04-29 20:42:35 +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