Eric Espie e105cc6d44 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ...

# 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

2022-07-11 09:23:18 +02:00

..

additionals-npm.json

Update setup licenses for NPM libs

2021-03-30 15:56:47 +02:00

community-licenses.xml

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

2022-07-11 09:23:18 +02:00