mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-31 14:12:29 +01:00
Conflicts: ChangeLog htdocs/comm/remise.php htdocs/core/class/html.form.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/variants/combinations.php