Commits
Valdis Murzins authored 72b1871d097M
A.F....... [ZBXNEXT-2102,ZBXNEXT-1076] merged with parent branch; resolved conflict in: frontends/php/include/classes/api/services/CMap.php frontends/php/app/controllers/CControllerWidgetNavigationtreeView.php
Showing diff to9da11691e6a