forked from Wavyzz/dolibarr
Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php
Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php