Commits
Valdis Murzins authored df7c49caab9M
..F....... [ZBXNEXT-4768] updated to latest from master; resolved conflicts in: - ui/app/views/js/service.list.js.php - ui/app/views/js/sla.list.js.php - ui/js/common.js - ui/tests/api_json/data/data_test.sql - ui/tests/api_json/testTaskCreate.php
Showing diff tod6a482deef3