composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	core/config.class.inc.php
This commit is contained in:
Molkobain
2022-01-12 15:54:18 +01:00
parent c17ceb1702 31e7a5383c
commit 812606db78
93 changed files with 4027 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/application/search/CriterionConversionTest.php
View File

@@ -44,6 +44,7 @@ use Dict;
/**
* @group itopRequestMgmt
* @group itopServiceMgmt
*
* @runTestsInSeparateProcesses
* @preserveGlobalState disabled
* @backupGlobals disabled