Pierre Goiffon
|
c955fe00b7
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# application/cmdbabstract.class.inc.php
# application/utils.inc.php
# core/coreexception.class.inc.php
# core/userrights.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
# tests/php-unit-tests/README.md
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
|
2023-11-15 15:03:04 +01:00 |
|