Commits
Janis Freibergs authored bdf574c4649M
.......... [ZBXNEXT-8087] updated to latest from master; resolved conflicts - ui/app/controllers/CControllerPopupImport.php - ui/include/classes/helpers/CTemplateHelper.php - ui/include/classes/import/importers/CTemplateImporter.php
Showing diff to353a2f0f2b2