Laurent Destailleur 018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/comm/propal.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/product/class/product.class.php htdocs/projet/class/project.class.php		2014-06-25 20:22:25 +02:00
..
commande.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-06-25 20:22:25 +02:00
commandestats.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00