mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-09 18:42:53 +01:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user