mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-07 02:28:43 +02:00
# Conflicts: # core/attributedef.class.inc.php # setup/extensionsmap.class.inc.php # tests/php-unit-tests/composer.lock
# Conflicts: # core/attributedef.class.inc.php # setup/extensionsmap.class.inc.php # tests/php-unit-tests/composer.lock