mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-12 23:14:18 +01:00
# Conflicts: # application/applicationextension.inc.php # application/cmdbabstract.class.inc.php # core/dbobject.class.php # core/kpi.class.inc.php # core/metamodel.class.php # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php