Commits
Ivo Kurzemnieks authored 7e058be5ff0M
.......... [ZBXNEXT-4200,ZBXNEXT-4500] updated to latest from trunk and resolved frontend conflicts in disc_prototypes.php and CItemGeneral.php (server conflicts remain in lld_item.c)
Showing diff to57104f171ec