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

Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
This commit is contained in:
Laurent Destailleur
2018-09-02 15:48:26 +02:00
81 changed files with 230 additions and 77 deletions

View File

@@ -62,7 +62,9 @@ class RestAPIDocumentTest extends PHPUnit_Framework_TestCase
*/
public function __construct()
{
//$this->sharedFixture
parent::__construct();
//$this->sharedFixture
global $conf,$user,$langs,$db;
$this->savconf = $conf;
$this->savuser = $user;