Commits
Andrejs Griščenko authored 7b6b84315aeM
.......... [ZBXNEXT-6478] updated to the master branch; resolved conflicts in: - create/src/schema.tmpl - sass/img/icon-sprite.svg - sass/img_source/icons-sprite.ai - sass/stylesheets/sass/screen.scss - src/go/pkg/version/version.go - src/libs/zbxdbupgrade/dbupgrade_5030.c - ui/app/controllers/CControllerDashboardView.php - ui/app/controllers/CControllerProfileUpdate.php - ui/app/views/js/reports.auditlog.list.js.php - ui/app/views/monitoring.dashboard.view.php - ui/assets/img/icon-sprite.svg - ui/assets/styles/blue-theme.css - ui/assets/styles/dark-theme.css - ui/assets/styles/hc-dark.css - ui/assets/styles/hc-light.css - ui/include/classes/api/services/CAuditLog.php - ui/include/classes/mvc/CRouter.php - ui/include/defines.inc.php - ui/js/menupopup.js
Showing diff to37c8917c4cc