Commits
Aleksandrs Subins authored cddd7b99893M
.......... [ZBXNEXT-9827] updated to latest master; conflict resolved in: # sass/stylesheets/sass/base/_colors.scss # sass/stylesheets/sass/hc-dark.scss # sass/stylesheets/sass/hc-light.scss # ui/app/controllers/CControllerHostUpdateGeneral.php # ui/js/defines.js # ui/js/macrovalue.js
Showing diff todf3638e9e20