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

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

Browse Source 
# Conflicts:
#	pages/ajax.render.php
This commit is contained in:
Pierre Goiffon
2023-12-19 18:41:57 +01:00
parent 2144933927 4ee70cb95a
commit e007e09155
12 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/php-unit-tests/legacy-tests/benchmark.php
View File

@@ -781,7 +781,7 @@ try
case 'create_structure':
$oP->no_cache();
$oP->add_xframe_options('DENY');
$oP->add_http_headers('DENY');
$iPlannedContacts = Utils::ReadParam('plannedcontacts');
$iPlannedContracts = Utils::ReadParam('plannedcontracts');