composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-30 05:58:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/log.class.inc.php
#	setup/modelfactory.class.inc.php
This commit is contained in:
Benjamin Dalsass
2022-06-08 12:38:41 +02:00
parent 834084a3e2 4c585614cd
commit f014ebfeb1
6 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/ItopDataTestCase.php
View File

@@ -785,6 +785,7 @@ class ItopDataTestCase extends ItopTestCase
// Create a specific organization for the tests
$oOrg = $this->CreateOrganization('UnitTestOrganization');
$this->iTestOrgId = $oOrg->GetKey();
return $oOrg;
}
/**