Commits
Ivo Kurzemnieks authored 58f36e823fbM
.......... [ZBX-20225] updated to latest from /master and resolved conflicts # Conflicts: # ui/app/views/js/administration.proxy.list.js.php # ui/app/views/js/configuration.host.list.js.php # ui/app/views/js/monitoring.host.view.js.php # ui/app/views/js/monitoring.latest.view.js.php # ui/app/views/js/monitoring.map.view.js.php # ui/app/views/js/monitoring.problem.view.js.php # ui/app/views/js/monitoring.web.view.js.php # ui/app/views/js/search.js.php # ui/include/views/configuration.graph.edit.php # ui/include/views/js/configuration.graph.edit.js.php # ui/include/views/js/configuration.hostgroups.list.js.php # ui/include/views/js/reports.toptriggers.js.php # ui/include/views/js/tr_events.js.php
Showing diff to88daeac3a89