Commits
Alexander Vladishev authored 29c14c3bf21M
.......... [ZBXNEXT-2592] updated to the latest master; fixed conflicts in: - create/src/schema.tmpl - ui/include/classes/export/CConfigurationExportBuilder.php - ui/include/defines.inc.php - ui/include/views/configuration.triggers.edit.php - ui/tests/selenium/roles/testFormUserRoles.php - ui/tests/selenium/testTriggerDependencies.php - ui/triggers.php
Showing diff toc4a4c738bc2