mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-06 17:48:25 +01:00
Conflicts: ChangeLog htdocs/compta/prelevement/bons.php htdocs/compta/prelevement/fiche-stat.php htdocs/contact/class/contact.class.php htdocs/contrat/class/contrat.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/modSociete.class.php htdocs/projet/fiche.php test/phpunit/FilesLibTest.php