Laurent Destailleur 31eb4bda88 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/categories/class/categorie.class.php htdocs/compta/facture.php		2014-09-06 00:26:11 +02:00
..
categorie.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-06 00:26:11 +02:00