Commits
Aleksandrs Subins authored e222c02f214M
A.F.I...S. [ZBXNEXT-6411] updated to latest master; resolved conflicts in : # create/src/schema.tmpl # create/src/templates.tmpl - ours for now # include/zbxserver.h # src/libs/zbxdbcache/dbconfig.c # src/libs/zbxdbupgrade/dbupgrade_5030.c # src/libs/zbxserver/expression.c # ui/include/classes/import/CImportDataAdapter.php # ui/include/classes/import/CConfigurationImport.php # ui/include/classes/import/CConfigurationImportcompare.php # ui/include/classes/import/importers/CTemplateImporter.php # ui/include/classes/import/converters/C52ImportConverter.php # ui/include/defines.inc.php # ui/tests/unit/include/classes/import/CImportDataAdapterTest.php # ui/tests/unit/include/classes/import/converters/C52ImportConverterTest.php
Showing diff tob559fd0b02b