Commits
Aleksandrs Subins authored 3c287c84ee3M
A.F....... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in: - ui/app/controllers/CControllerPopupImport.php - ui/include/classes/import/CConfigurationImport.php - ui/include/classes/import/CImportReferencer.php - ui/include/classes/import/converters/C52ImportConverter.php
Showing diff to88171d023e0