Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: htdocs/core/lib/project.lib.php
2026-02-09 01:12:33 +01:00 · 2019-07-25 17:54:14 +02:00
parent fe22f11f10 4a8377e4fd
commit a46bfc7a29
527 changed files with 6479 additions and 4507 deletions
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -143,7 +143,6 @@ class DolibarrApi
        unset($object->picto);

        unset($object->fieldsforcombobox);
-		unset($object->comments);

        unset($object->skip_update_total);
        unset($object->context);