Commits
Alexander Shubin authored 51f9687ccbeM
.......... [ZBXNEXT-5330] updated to latest from /master; resolved conflicts in: # Conflicts: # frontends/php/app/controllers/CControllerDashboardView.php # frontends/php/assets/styles/blue-theme.css # frontends/php/assets/styles/dark-theme.css # frontends/php/assets/styles/hc-dark.css # frontends/php/assets/styles/hc-light.css # frontends/php/include/classes/widgets/CWidgetConfig.php # sass/stylesheets/sass/screen.scss
Showing diff to9476044e592