Commits
Valdis Murzins authored fd96faebedcM
.......... [ZBXNEXT-7107] updated to latest from master; resolved conflicts in: - ui/app/controllers/CControllerPopupTriggerWizard.php - ui/app/views/js/popup.triggerwizard.js.php - ui/app/views/popup.triggerwizard.php - ui/include/classes/triggers/CTextTriggerConstructor.php - ui/tests/unit/include/classes/triggers/CTextTriggerConstructorTest.php
Showing diff to9c8a184942b