Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| index.php | ||
| quadri_detail.php | ||
| reglement.php | ||
Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| index.php | ||
| quadri_detail.php | ||
| reglement.php | ||