Commits
Gregory Chalenko authored 6dfe7e6f4e0M
.......... [ZBXNEXT-8486] updated to latest master, partial update; resolved conflicts in: - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_6050.c - ui/app/partials/configuration.tags.tab.php - ui/app/views/js/monitoring.host.dashboard.view.js.php - ui/include/classes/helpers/CMenuHelper.php - ui/include/classes/mvc/CLegacyAction.php - ui/include/defines.inc.php - ui/include/views/configuration.item.list.php - ui/include/views/configuration.item.prototype.edit.php - ui/include/views/js/configuration.item.list.js.php - ui/include/views/js/configuration.item.prototype.list.js.php - ui/include/views/js/configuration.triggers.list.js.php - ui/js/common.js
Showing diff to6515b5746f2