Commits
Andrejs Griščenko authored 35e350c7d62M
.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to the latest from master; resolved conflicts in: - ui/include/classes/api/CAudit.php - ui/include/classes/api/services/CItem.php - ui/include/classes/api/services/CItemGeneral.php - ui/include/classes/api/services/CItemPrototype.php - ui/include/classes/validators/CApiInputValidator.php - ui/include/defines.inc.php - ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
Showing diff to184556689f2