Laurent Destailleur 91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/compta/facture.php htdocs/core/lib/project.lib.php htdocs/main.inc.php		2014-08-08 01:19:03 +02:00
..
project.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-08-08 01:19:03 +02:00
task.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-07-08 20:22:51 +02:00