Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
parent ec13d3811e 709542e27d
commit 5ea3f09e17
18 changed files with 119 additions and 35 deletions
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -32,7 +32,7 @@ class DolibarrApi
    /**
     * @var DoliDb        $db Database object
     */
-    protected static $db;
+    protected $db;

    /**
     * @var Restler     $r	Restler object