Laurent Destailleur eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php

2015-11-13 11:43:29 +01:00

..

expedition.class.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-11-13 11:43:29 +01:00

expeditionbatch.class.php

Removed duplicated SQL error logging

2014-06-13 02:28:30 +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