mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # composer.lock # core/log.class.inc.php # datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml # lib/composer/autoload_real.php # setup/licenses/community-licenses.xml # setup/setuputils.class.inc.php