Commits
Aleksandrs Subins authored 667fa4d4f60M
.......... [ZBXNEXT-5281] updated to latest from /master; resolved conflicts in: # Conflicts: # frontends/php/app/controllers/CControllerDashboardView.php # frontends/php/include/classes/widgets/CWidgetConfig.php # frontends/php/include/defines.inc.php # frontends/php/js/dashboard.grid.js # src/libs/zbxdbupgrade/dbupgrade_4030.c
Showing diff tof1f72b97995