Commits

Diana Dauksa authored e1ac4aceca5M
.......... [ZBXNEXT-8686] updated to the latest from master; resolved conflicts in schema.tmpl, dbupgrade_6050.c, defines.inc.php
Showing diff toa0958a54013
Everything looks good. We'll let you know here if there's anything you should know about.