Commits
Vladimirs Maksimovs authored f3c11ca6947M
.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; resolved conflicts in: # ui/disc_prototypes.php # ui/include/classes/api/services/CItemGeneral.php # ui/include/classes/api/services/CItemGeneralOld.php # ui/include/items.inc.php # ui/items.php # ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
Showing diff toed310aaeb77