composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/version.xml
This commit is contained in:
Pierre Goiffon
2019-03-21 17:46:30 +01:00
parent 9bb365e60d cac0da4e3d
commit 2a0928b4be
31 changed files with 107 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/module.itop-portal-base.php
View File

@@ -2,7 +2,7 @@
SetupWebPage::AddModule(
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
'itop-portal-base/2.6.0', array(
'itop-portal-base/2.6.1', array(
// Identification
'label' => 'Portal Development Library',
'category' => 'Portal',