Laurent Destailleur 8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php

2014-06-20 15:26:02 +02:00

..

commande.class.php

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

2014-06-20 15:26:02 +02:00

commandestats.class.php

Removed closing php tag

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