mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-11 03:51:25 +01:00
into IonAgorria-resources-fixes Conflicts: htdocs/core/tpl/resource_add.tpl.php htdocs/resource/element_resource.php
into IonAgorria-resources-fixes Conflicts: htdocs/core/tpl/resource_add.tpl.php htdocs/resource/element_resource.php