Commits
Andrejs Griščenko authored 9438aded479M
.......... [ZBXNEXT-9546] updated to the latest from 'master'; resolved conflicts in: - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_7050.c - ui/host_prototypes.php - ui/include/defines.inc.php - ui/include/views/configuration.host.prototype.edit.php - ui/include/views/js/configuration.host.prototype.edit.js.php
Showing diff to847c2da4cc2