Commits
Vladimirs Maksimovs authored 553f451d6aeM
.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; resolved conflicts in: # ui/disc_prototypes.php # ui/include/classes/api/services/CItem.php # ui/include/classes/api/services/CItemGeneral.php # ui/include/classes/validators/CApiInputValidator.php # ui/items.php
Showing diff tod914b835cd3