Commits
Vladislavs Sokurenko authored 4fa7ad67b94M
.......... [ZBXNEXT-4877] merged from upstream, fixed conflicts in create/src/schema.tmpl, frontends/php/include/classes/import/converters/C40ImportConverter.php, frontends/php/include/classes/import/validators/C42XmlValidator.php, frontends/php/include/defines.inc.php, src/libs/zbxdbhigh/lld.c, src/libs/zbxdbhigh/lld_item.c, src/libs/zbxdbupgrade/dbupgrade_4010.c
Showing diff to48a0144911a