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

Merge branch 'support/2.7' into develop

Browse Source 
# Conflicts:
#	.jenkins/bin/tests/phpunit.sh
#	Jenkinsfile
#	core/config.class.inc.php
#	core/dbobjectsearch.class.php
#	core/ormlinkset.class.inc.php
#	datamodels/2.x/combodo-db-tools/dbtools.php
#	dictionaries/nl.dictionary.itop.ui.php
This commit is contained in:
Pierre Goiffon
2020-08-17 09:36:43 +02:00
parent a1f5d8041e a35b2d83b7
commit 71848cb56b
59 changed files with 1497 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
View File

@@ -42,7 +42,8 @@ SetupWebPage::AddModule(
//
'datamodel' => array(
'model.combodo-db-tools.php',
'src/Service/DBToolsUtils.php'
'src/Service/DBToolsUtils.php',
'src/Service/DBAnalyzerUtils.php',
),
'webservice' => array(),
'data.struct' => array(),