mirror of
https://github.com/Combodo/iTop.git
synced 2026-08-22 14:18:18 +02:00
8d75531d95
# Conflicts: # datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-high-contrast-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php # datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-tritanopia-theme.php # datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php # datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php # datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php # datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/zh_cn.dict.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php # datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/zh_cn.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php # datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php # datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php # datamodels/2.x/itop-themes-compat/dictionaries/zh_cn.dict.itop-themes-compat.php # datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/zh_cn.dict.itop-virtualization-mgmt.php # dictionaries/core/orm-value/orm-document/zh_cn.dictionary.itop.orm-document.php # dictionaries/core/uniqueness-rule/zh_cn.dictionary.itop.uniqueness-rule.php # dictionaries/ui/application/links/zh_cn.dictionary.itop.links.php # dictionaries/ui/application/newsroom/zh_cn.dictionary.itop.newsroom.php # dictionaries/ui/application/welcome-popup/zh_cn.dictionary.itop.welcome-popup.php # dictionaries/ui/layouts/activity-panel/zh_cn.dictionary.itop.activity-panel.php # dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php # dictionaries/ui/pages/notifications-center/zh_cn.dictionary.itop.notifications-center.php # dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php # dictionaries/zh_cn.dictionary.itop.core.php # dictionaries/zh_cn.dictionary.itop.ui.php # setup/wizardsteps/WizStepLicense2.php