Laurent Destailleur b4881645d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/lib/functions.lib.php		2018-03-18 20:21:59 +01:00
..
api_projects.class.php
api_tasks.class.php
index.html
project.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-18 20:21:59 +01:00
projectstats.class.php
task.class.php	Fix status of task	2018-03-06 21:51:43 +01:00
taskstats.class.php