mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-01 05:43:24 +01:00
Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php
Conflicts: htdocs/compta/salaries/card.php htdocs/compta/sociales/class/chargesociales.class.php htdocs/takepos/invoice.php