Commits
Elina Pulke authored 5f4c60d44feM
..F....... [ZBXNEXT-8074] updated to latest from master; resolved conflicts in -ui/app/controllers/CControllerScriptEdit.php, -ui/app/controllers/CControllerUserroleEdit.php, -ui/app/views/configuration.host.list.php, -ui/app/views/js/popup.import.js.php, -ui/app/views/popup.scriptexec.php, -ui/include/classes/html/CForm.php, -ui/include/views/configuration.template.list.php, -ui/app/views/js/configuration.host.list.js.php, -ui/include/views/js/configuration.template.list.js.php
Showing diff tod0205095ebf