mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 10:38:45 +02:00
# Conflicts: # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/cs.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/da.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/de.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/ja.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/sk.dict.itop-bridge-cmdb-ticket.php # datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php # datamodels/2.x/itop-problem-mgmt/dictionaries/hu.dict.itop-problem-mgmt.php # datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php # datamodels/2.x/itop-structure/dictionaries/fr.dict.itop-structure.php # dictionaries/hu.dictionary.itop.core.php