Commits

Ivo Kurzemnieks authored 3f687a6fe57M
.......... [ZBXNEXT-875] updated to latest from /master and resolved conflicts in dbupgrade_7030.c, schema.tmpl and defines.inc.php
Showing diff to7b8b41e88bc
Everything looks good. We'll let you know here if there's anything you should know about.