Commits
Valdis Murzins authored 19ff036d18bM
A.F....... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in: - ui/include/func.inc.php - ui/include/classes/export/CConfigurationExportBuilder.php - ui/include/classes/api/services/CTemplateDashboard.php - ui/include/classes/api/services/CTemplate.php - ui/include/classes/api/services/CDashboardGeneral.php - ui/app/controllers/CControllerPopupImportCompare.php - ui/include/classes/export/CConfigurationExport.php - ui/include/classes/export/CConfigurationExportBuilder.php
Showing diff to483b4bfa329