Laurent Destailleur 7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/modules/modExpedition.class.php htdocs/projet/class/project.class.php		2014-05-07 19:30:19 +02:00
..
project.class.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-05-07 19:30:19 +02:00
task.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00