composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	sources/Application/UI/Base/Layout/ActivityPanel/ActivityPanel.php
This commit is contained in:
Eric Espie
2025-01-13 09:18:00 +01:00
parent 79a46581ef efb7831a5a
commit e0b12144cb
65 changed files with 1746 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-tickets/module.itop-tickets.php
View File

@@ -32,7 +32,7 @@ SetupWebPage::AddModule(
// Documentation
//
'doc.manual_setup' => 'https://www.itophub.io/wiki/page?id='.utils::GetItopVersionWikiSyntax().':admin:cron',
'doc.manual_setup' => '',
'doc.more_information' => '',
// Default settings