Conflicts: htdocs/compta/bank/bankentries.php htdocs/core/lib/admin.lib.php htdocs/install/mysql/migration/repair.sql |
||
|---|---|---|
| .. | ||
| doc_generic_proposal_odt.modules.php | ||
| index.html | ||
| pdf_azur.modules.php | ||
Conflicts: htdocs/compta/bank/bankentries.php htdocs/core/lib/admin.lib.php htdocs/install/mysql/migration/repair.sql |
||
|---|---|---|
| .. | ||
| doc_generic_proposal_odt.modules.php | ||
| index.html | ||
| pdf_azur.modules.php | ||