Commits
Gregory Chalenko authored 92dca6948a4M
..F....... [ZBXNEXT-4361] merged from latest trunk; fixed conflicts in: - frontends/php/app/controllers/CControllerProblemView.php - frontends/php/app/controllers/CControllerProfileUpdate.php - frontends/php/app/views/monitoring.problem.view.php - frontends/php/history.php - frontends/php/include/classes/html/CFilter.php - frontends/php/include/forms.inc.php - frontends/php/include/views/configuration.host.list.php - frontends/php/include/views/monitoring.history.php - frontends/php/include/views/monitoring.slides.php - frontends/php/js/gtlc.js
Showing diff tof969ed5c600