Conflicts: htdocs/core/lib/functions2.lib.php htdocs/install/mysql/migration/repair.sql htdocs/langs/en_US/errors.lang htdocs/product/fiche.php htdocs/projet/tasks/task.php |
||
|---|---|---|
| .. | ||
| mod_livraison_jade.php | ||
| mod_livraison_saphir.php | ||
| modules_livraison.php | ||