Laurent Destailleur 1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php

2015-08-13 03:18:02 +02:00

..

commande.class.php

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

2015-08-13 03:18:02 +02:00

commandestats.class.php

Removed closing php tag

2014-05-03 18:18:44 +02:00