Commits
Aleksandrs Subins authored f7ad4efb7deM
.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in: # create/src/schema.tmpl # src/libs/zbxdbupgrade/dbupgrade_6030.c # ui/app/views/monitoring.problem.view.php # ui/app/views/popup.massupdate.service.php # ui/include/classes/widgets/CWidgetHelper.php # ui/include/classes/widgets/fields/CWidgetFieldMsHost.php # ui/include/classes/widgets/fields/CWidgetFieldMsService.php # ui/include/classes/widgets/fields/CWidgetFieldMsSla.php # ui/include/classes/widgets/forms/CWidgetFormDataOver.php # ui/include/classes/widgets/forms/CWidgetFormGeoMap.php # ui/include/classes/widgets/forms/CWidgetFormProblemHosts.php # ui/include/classes/widgets/forms/CWidgetFormProblems.php # ui/include/classes/widgets/forms/CWidgetFormProblemsBySv.php # ui/include/classes/widgets/forms/CWidgetFormTopHosts.php # ui/include/classes/widgets/forms/CWidgetFormTrigOver.php # ui/include/classes/widgets/forms/CWidgetFormWeb.php # ui/include/defines.inc.php
Showing diff toe39a8fc01dc