Commits
Miks Kronkalns authored c1a305fee9fM
A.F.I..... [ZBXNEXT-6945] updated to latest from master; Resolved conflicts in: - create/src/schema.tmpl - include/dbschema.h - src/libs/zbxdbupgrade/dbupgrade_5050.c - ui/include/classes/api/services/CSettings.php - ui/include/classes/helpers/CSettingsHelper.php - ui/include/defines.inc.php - ui/include/schema.inc.php
Showing diff to3c6581c2367