composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-11 20:14:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source 
# Conflicts:
#	core/designdocument.class.inc.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
This commit is contained in:
Eric Espie
2024-03-19 14:06:24 +01:00
parent 193af6c759 2f30a0146e
commit 6098842d9f
16 changed files with 3223 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.expected.xml
View File

@@ -37,6 +37,9 @@
<value id="test" _delta="define">
<code>test</code>
</value>
<value id="nada" _delta="define">
<code/>
</value>
</values>
</field>
</fields>

1
tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/1.7_to_3.0.input.xml
View File

@@ -35,6 +35,7 @@
<field id="status" _delta="must_exist">
<values>
<value id="test" _delta="define">test</value>
<value id="nada" _delta="define"/>
</values>
</field>
</fields>