mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 15:34:12 +01:00
# Conflicts: # core/config.class.inc.php # datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig # datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig # setup/setuputils.class.inc.php # test/setup/SetupUtilsTest.php