mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # core/restservices.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php # tests/php-unit-tests/unitary-tests/core/Delta/delta_test_sanitize_output.xml # tests/php-unit-tests/unitary-tests/core/RestServicesSanitizeOutputTest.php # tests/php-unit-tests/unitary-tests/core/RestServicesTest.php # webservices/rest.php