Commits
Alexander Vladishev authored c5ae7ebee0aM
.......... [ZBXNEXT-4731] updated to the latest trunk; fixed conflicts in: - frontends/php/js/multiselect.js - frontends/php/include/schema.inc.php - create/src/schema.tmpl - frontends/php/include/classes/import/converters/C40ImportConverter.php - frontends/php/include/classes/import/validators/C42XmlValidator.php - src/libs/zbxdbupgrade/dbupgrade_4010.c - frontends/php/include/defines.inc.php
Showing diff to9c72f539440