Conflicts: ChangeLog htdocs/compta/bank/virement.php htdocs/core/tpl/objectline_create.tpl.php htdocs/product/card.php htdocs/societe/soc.php |
||
|---|---|---|
| .. | ||
| facturation1.tpl.php | ||
| index.html | ||
| liste_articles.tpl.php | ||
| menu.tpl.php | ||
| ticket.tpl.php | ||
| validation1.tpl.php | ||
| validation2.tpl.php | ||