Commits
Janis Freibergs authored 61644633e40M
.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; resolved conflicts - ui/include/classes/api/managers/CItemManager.php - ui/include/classes/api/managers/CItemPrototypeManager.php - ui/include/defines.inc.php
Showing diff to51211a94226