Laurent Destailleur 499d93b8c4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/projet/class/task.class.php
	htdocs/projet/tasks/task.php

2018-08-23 19:50:58 +02:00

..

api_projects.class.php

…

api_tasks.class.php

…

index.html

…

project.class.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

projectstats.class.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-06-20 21:56:10 +02:00

task.class.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

taskstats.class.php

…