mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-07 18:18:18 +01:00
Conflicts: htdocs/bom/tpl/objectline_create.tpl.php htdocs/compta/bank/releve.php htdocs/core/class/html.formsetup.class.php htdocs/takepos/freezone.php