Commits
Valdis Murzins authored 1158388c4fcM
..F.I..... [ZBXNEXT-6757] updated to latest from master; resolved conflicts in: - ui/app/views/js/monitoring.host.view.js.php - ui/app/views/monitoring.latest.view.php - ui/app/views/js/monitoring.latest.view.js.php - ui/app/views/monitoring.problem.view.php - ui/app/views/js/monitoring.problem.view.js.php - ui/app/views/popup.service.edit.php - src/libs/zbxdbupgrade/dbupgrade_5050.c - ui/include/defines.inc.php - create/src/schema.tmpl - ui/include/views/js/monitoring.overview.items.js.php (removed) - ui/include/views/js/monitoring.overview.triggers.js.php (removed) - ui/include/views/monitoring.overview.items.php (removed) - ui/include/views/monitoring.overview.triggers.php (removed) - ui/overview.php
Showing diff to33a28846198