Laurent Destailleur 42d992b009 Merge remote-tracking branch 'origin/3.6' into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/lib/project.lib.php htdocs/fourn/facture/fiche.php htdocs/projet/class/project.class.php		2014-08-08 01:26:53 +02:00
..
index.php	Fix: Missing line total	2014-08-08 01:21:57 +02:00
list.php	Merge remote-tracking branch 'origin/3.6' into develop	2014-08-08 01:26:53 +02:00