Commits
Valdis Murzins authored ab8169f2d53M
A.F....... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in: - sass/stylesheets/sass/screen.scss - ui/include/classes/mvc/CRouter.php - ui/include/classes/validators/CApiInputValidator.php - ui/include/defines.inc.php - ui/screenconf.php - ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
Showing diff to255317c7c3f