mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-08 10:38:15 +01:00
Conflicts: ChangeLog htdocs/core/class/notify.class.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
Conflicts: ChangeLog htdocs/core/class/notify.class.php htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php