Commits
Vladimirs Maksimovs authored bc70daa6f9eM
.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; resolved conflicts in: # ui/disc_prototypes.php # ui/include/classes/api/services/CHostGeneral.php # ui/include/classes/validators/CApiInputValidator.php # ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
Showing diff to5c28554dbd7