Commits

Elina Pulke authored bf7eaa49cbdM
..F....... [ZBXNEXT-8074] updated to latest from master; resolved conflicts in -create/src/schema.tmpl, -src/libs/zbxdbupgrade/dbupgrade_6030.c, -ui/include/defines.inc.php, -ui/include/views/configuration.graph.list.php, -ui/include/views/configuration.item.list.php, -ui/include/views/configuration.triggers.list.php, -ui/app/controllers/CControllerCopyEdit.php, -ui/app/views/copy.edit.php
Showing diff tod084bb312d4