Commits

Gregory Chalenko authored 7f2871ca3feM
.......... [ZBXNEXT-6876] updated to latest master; fixed conflicts in: - ui/include/defines.inc.php - src/libs/zbxdbupgrade/dbupgrade_6050.c - create/src/schema.tmpl
Showing diff to0062514deea
Everything looks good. We'll let you know here if there's anything you should know about.