Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/compta/bank/bankentries.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| index.php | ||
| quadri_detail.php | ||
| reglement.php | ||
Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/compta/bank/bankentries.php htdocs/install/mysql/migration/4.0.0-5.0.0.sql |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| index.php | ||
| quadri_detail.php | ||
| reglement.php | ||