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 branch 'develop' into feature/faf_event_service

Browse Source 
# Conflicts:
#	core/cmdbobject.class.inc.php
#	core/dbobject.class.php
#	core/designdocument.class.inc.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
This commit is contained in:
Eric Espie
2022-09-19 09:45:08 +02:00
parent 2c265aab44 e5a9648206
commit 71464f6d0e
1147 changed files with 76240 additions and 38567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -27,7 +27,9 @@
<attribute id="ref"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="ref"/>
@@ -398,7 +400,9 @@
<attribute id="contact_id"/>
</attributes>
</naming>
<icon/>
<style>
<icon/>
</style>
<reconciliation>
<attributes>
<attribute id="ticket_id"/>