mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-31 22:22:28 +01:00
Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/core/class/evalmath.class.php htdocs/core/class/extrafields.class.php htdocs/install/mysql/migration/11.0.0-12.0.0.sql htdocs/langs/en_US/cashdesk.lang htdocs/societe/class/societe.class.php