forked from Wavyzz/dolibarr
Conflicts: htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/task.php
Conflicts: htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/task.php