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/release/2.6.0-community' into release/2.6

Browse Source 
# Conflicts:
#	install.txt
This commit is contained in:
Pierre Goiffon
2019-01-09 17:23:43 +01:00
parent a85bedd31c 5d09841cd5
commit 340cacc691
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
View File

@@ -1725,7 +1725,7 @@
</class>
<class id="Organization">
<fields>
<field id="overview" xsi:type="AttributeDashboard">
<field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
<definition>
<cells>
<cell id="9000" _delta="delete">

2
datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
View File

@@ -1747,7 +1747,7 @@
</class>
<class id="Organization">
<fields>
<field id="overview" xsi:type="AttributeDashboard">
<field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
<definition>
<cells>
<cell id="9000" _delta="delete">