Pierre Goiffon
|
d8e2a1cc7c
|
Merge branch 'support/2.7' into develop
# Conflicts:
# README.md
# composer.json
# composer.lock
# core/cmdbsource.class.inc.php
# core/dbobject.class.php
# datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
# datamodels/2.x/combodo-db-tools/dbtools.php
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# lib/composer/platform_check.php
# pages/ajax.render.php
# pages/csvimport.php
# setup/ajax.dataloader.php
# setup/index.php
# setup/setuputils.class.inc.php
# test/application/UtilsTest.php
|
2021-06-14 16:19:56 +02:00 |
|