mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
379062f1f7
Most of the conflicts are caused by HU translations (N°7077 / #584) # Conflicts: # css/setup.css # datamodels/2.x/authent-cas/dictionaries/hu.dict.authent-cas.php # datamodels/2.x/authent-ldap/dictionaries/hu.dict.authent-ldap.php # datamodels/2.x/authent-local/dictionaries/hu.dict.authent-local.php # datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/hu.dict.combodo-backoffice-darkmoon-theme.php # datamodels/2.x/combodo-db-tools/dictionaries/hu.dict.combodo-db-tools.php # datamodels/2.x/itop-attachments/dictionaries/hu.dict.itop-attachments.php # datamodels/2.x/itop-backup/dictionaries/hu.dict.itop-backup.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/hu.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-change-mgmt-itil/dictionaries/hu.dict.itop-change-mgmt-itil.php # datamodels/2.x/itop-change-mgmt/dictionaries/hu.dict.itop-change-mgmt.php # datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php # datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php # datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php # datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php # datamodels/2.x/itop-hub-connector/dictionaries/hu.dict.itop-hub-connector.php # datamodels/2.x/itop-incident-mgmt-itil/dictionaries/hu.dict.itop-incident-mgmt-itil.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-oauth-client/hu.dict.itop-oauth-client.php # datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php # datamodels/2.x/itop-portal/dictionaries/hu.dict.itop-portal.php # datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/hu.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/hu.dict.itop-request-mgmt.php # datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php # datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php # datamodels/2.x/itop-structure/dictionaries/hu.dict.itop-structure.php # datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php # dictionaries/hu.dictionary.itop.core.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/ui/components/breadcrumbs/hu.dictionary.itop.breadcrumbs.php # dictionaries/ui/components/datatable/hu.dictionary.itop.datatable.php # dictionaries/ui/components/field/hu.dictionary.itop.field.php # dictionaries/ui/components/global-search/hu.dictionary.itop.global-search.php # dictionaries/ui/components/input/hu.dictionary.itop.input.php # dictionaries/ui/components/quick-create/hu.dictionary.itop.quick-create.php # dictionaries/ui/layouts/activity-panel/hu.dictionary.itop.activity-panel.php # dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php # dictionaries/ui/layouts/object-details/hu.dictionary.itop.object-details.php # dictionaries/ui/layouts/page-content/hu.dictionary.itop.page-content.php # dictionaries/ui/layouts/tab-container/hu.dictionary.itop.tab-container.php # dictionaries/ui/pages/errorpage/hu.dictionary.itop.errorpage.php # dictionaries/ui/pages/preferences/hu.dictionary.itop.preferences.php # tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php