mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # application/utils.inc.php # core/htmlsanitizer.class.inc.php # datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php # pages/UI.php # test/OQL/DataLocalizerTest.php # test/OQL/OQLToSQLAllClassesTest.php # test/OQL/OQLToSQLGroupByTest.php # test/OQL/OQLToSQLNestedSelectTest.php # test/OQL/OQLToSQLTest.php # test/application/UtilsTest.php