mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-08 10:38:15 +01:00
Conflicts: htdocs/admin/mails_templates.php htdocs/societe/consumption.php htdocs/user/class/user.class.php
Conflicts: htdocs/admin/mails_templates.php htdocs/societe/consumption.php htdocs/user/class/user.class.php