Commits
Andrejs Griščenko authored 6fb21bdbacfM
.......... [ZBXNEXT-9546] updated to the 'master' branch; resolved conflicts in: - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_7030.c - src/zabbix_server/lld/lld_host.c - src/zabbix_server/lld/lld_item.c - ui/app/controllers/CControllerItemPrototypeList.php - ui/app/controllers/CControllerTriggerPrototypeList.php - ui/app/partials/configuration.tags.tab.php - ui/assets/styles/blue-theme.css - ui/assets/styles/dark-theme.css - ui/assets/styles/hc-dark.css - ui/assets/styles/hc-light.css - ui/host_prototypes.php - ui/include/classes/api/services/CHost.php - ui/include/classes/api/services/CHostBase.php - ui/include/classes/api/services/CHostPrototype.php - ui/include/classes/api/services/CItem.php - ui/include/classes/api/services/CItemPrototype.php - ui/include/classes/api/services/CTemplate.php - ui/include/classes/api/services/CTrigger.php - ui/include/classes/api/services/CTriggerGeneral.php - ui/include/classes/api/services/CTriggerPrototype.php - ui/include/classes/validators/CApiInputValidator.php - ui/include/defines.inc.php
Showing diff to53d6f1514ad