composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +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/cmdbsource.class.inc.php
#	test/core/CMDBSource/TransactionsTest.php
This commit is contained in:
Pierre Goiffon
2022-09-21 14:21:28 +02:00
parent 7071712a0a 88d743b1cc
commit a5b5518533
16 changed files with 126 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/core/dictTest.php
View File

@@ -80,6 +80,8 @@ PHP;
}
rmdir(APPROOT."env-$this->sEnvName".DIRECTORY_SEPARATOR."dictionaries");
rmdir(APPROOT."env-$this->sEnvName");
parent::tearDown();
}
/**