Molkobain 1c983e8093 Merge remote-tracking branch 'origin/support/2.6' into support/2.7 ...

# Conflicts:
#	core/config.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
#	pages/ajax.render.php

2021-08-18 16:12:22 +02:00

77 KiB

Raw Blame History

View Raw