forked from Wavyzz/dolibarr
Conflicts: ChangeLog htdocs/admin/tools/export_files.php htdocs/compta/paiement_charge.php htdocs/compta/sociales/card.php htdocs/core/lib/functions.lib.php htdocs/cron/list.php htdocs/filefunc.inc.php test/phpunit/FilesLibTest.php