mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-01 14:42:32 +01:00
Conflicts: htdocs/core/modules/modCashDesk.class.php htdocs/debugbar/class/DataCollector/DolLogsCollector.php htdocs/langs/en_US/admin.lang