Commits
Janis Freibergs authored 4e033a5b3f4M
.......... [ZBXNEXT-9827] updated to latest from master; resolved conflicts in: - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_7030.c - ui/include/classes/api/services/CHost.php - ui/include/classes/api/services/CHostPrototype.php - ui/include/classes/api/services/CTemplate.php - ui/include/defines.inc.php - ui/tests/api_json/data/data_test.sql - ui/tests/selenium/data/data_test.sql
Showing diff to565d9c2308a