Commits
Ginta Berzina authored 39df7566fefM
.......... [ZBXNEXT-10357] updated to latest from master; resolved conflicts in - ui/app/controllers/CControllerTimeoutsEdit.php - ui/app/controllers/CControllerTimeoutsUpdate.php - ui/app/views/js/administration.timeouts.edit.js.php - ui/app/views/administration.timeouts.edit.php
Showing diff tod04602786de