Commits
Eliza Sekace authored 6f9d5676e2dM
.......... [ZBXNEXT-2732] updated to latest from master; resolved conflicts in: - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_6050.c - src/zabbix_server/discoverer/discoverer.c - ui/app/controllers/CControllerDiscoveryCreate.php - ui/app/controllers/CControllerDiscoveryEdit.php - ui/app/controllers/CControllerDiscoveryUpdate.php - ui/app/views/configuration.discovery.edit.php - ui/app/views/js/configuration.discovery.edit.js.php - ui/include/defines.inc.php
Showing diff to4f564568914