mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: htdocs/comm/propal/card.php htdocs/projet/card.php htdocs/projet/contact.php htdocs/projet/element.php htdocs/projet/tasks.php htdocs/projet/tasks/comment.php htdocs/projet/tasks/contact.php htdocs/projet/tasks/document.php htdocs/projet/tasks/note.php htdocs/projet/tasks/task.php htdocs/projet/tasks/time.php |
||
|---|---|---|
| .. | ||
| doc_generic_proposal_odt.modules.php | ||
| index.html | ||
| pdf_azur.modules.php | ||
| pdf_cyan.modules.php | ||