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/2.7' into develop

Browse Source 
# Conflicts:
#	application/ajaxwebpage.class.inc.php
#	application/csvpage.class.inc.php
#	application/itopwebpage.class.inc.php
#	application/webpage.class.inc.php
#	application/xmlpage.class.inc.php
#	core/config.class.inc.php
#	css/css-variables.scss
#	datamodels/2.x/version.xml
#	pages/ajax.document.php
#	pages/ajax.render.php
#	pages/ajax.searchform.php
#	sources/application/TwigBase/Controller/Controller.php
This commit is contained in:
Pierre Goiffon
2020-12-10 17:59:16 +01:00
parent abf6d5422e c4756e8cec
commit 96e7f57a34
34 changed files with 489 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/wizardsteps.class.inc.php
View File

@@ -707,7 +707,7 @@ class WizStepLicense extends WizardStep
$aLicenses = SetupUtils::GetLicenses();
$oPage->add_style(
<<<EOF
fieldset {
fieldset ul{
max-height: 18em;
overflow: auto;
}