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

Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js

2014-09-02 12:57:33 +02:00

..

commande.class.php

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

2014-09-02 12:57:33 +02:00

commandestats.class.php

Removed closing php tag

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