Eric Espie f02e95e8bf Merge branch 'support/3.0' into develop ...

# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
#	test/twig/test.html
#	test/twig/test.html.twig

2022-11-30 13:57:28 +01:00

..

application

…

backups

…

core

…

coreExtensions

…

integration

…

itop-config/Validator

…

itop-tickets

…

postbuild_integration

…

service

…

setup

…

setup_params

…

sources

…

status

…

synchro

…

twig

Merge branch 'support/3.0' into develop

2022-11-30 13:57:28 +01:00

VisualTest

…

webservices

…

benchmark.php

…

build_test_oql.php

…

ci_description.ini

…

composer.json

…

composer.lock

…

config-test-farm.php

…

display_cache_content.php

…

GroupByAndFunctions.php

…

ItopDataTestCase.php

…

ItopTestCase.php

…

phpunit.xml.dist

…

postbuild_integration.xml.dist

…

replay_query_log.php

…

test.class.inc.php

…

test.php

…

testlist.inc.php

…

unittestautoload.php

…

VerifyOQL.php

…