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 |
||
|---|---|---|
| .. | ||
| class | ||
| emptyexample.php | ||
| import.php | ||
| index.php | ||
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 |
||
|---|---|---|
| .. | ||
| class | ||
| emptyexample.php | ||
| import.php | ||
| index.php | ||