Pierre Goiffon
|
8578d18e7f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/displayablegraph.class.inc.php
# core/log.class.inc.php
# datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# pages/UI.php
# setup/itopdesignformat.class.inc.php
# test/core/LogAPITest.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
# test/postbuild_integration/SetupCssIntegrityChecklistTest.php
# test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
# test/status/StatusTest.php
|
2022-01-10 16:15:00 +01:00 |
|