Laurent Destailleur 24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: build/makepack-dolibarr.pl htdocs/comm/propal.php htdocs/compta/facture.php htdocs/fourn/class/fournisseur.commande.class.php		2014-03-03 19:38:02 +01:00
..
contrat.class.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-03 19:38:02 +01:00