mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-06 00:53:00 +01:00
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts: test/phpunit/PricesTest.php test/phpunit/RestAPIUserTest.php test/phpunit/WebservicesInvoicesTest.php
This commit is contained in:
@@ -60,6 +60,8 @@ class DateLibTest extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
//$this->sharedFixture
|
||||
global $conf,$user,$langs,$db;
|
||||
$this->savconf=$conf;
|
||||
|
||||
Reference in New Issue
Block a user