Laurent Destailleur c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5 ...

Conflicts:
	htdocs/projet/class/project.class.php

2014-08-08 01:09:46 +02:00

..

project.class.php

Merge remote-tracking branch 'origin/3.4' into 3.5

2014-08-08 01:09:46 +02:00

task.class.php

Fix: Checkstyle

2014-07-08 01:15:59 +02:00