mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-12 20:41:26 +01:00
Conflicts: htdocs/core/modules/modCashDesk.class.php htdocs/debugbar/class/DataCollector/DolLogsCollector.php htdocs/langs/en_US/admin.lang