Commits
Alexander Vladishev authored a5f66a22928M
.......... [ZBX-21883] updated to the latest master; fixed conflicts in: - ui/widgets/web/views/widget.edit.php - ui/widgets/trigover/views/widget.edit.php - ui/widgets/tophosts/views/widget.edit.php - ui/widgets/problemsbysv/views/widget.edit.php - ui/widgets/problems/views/widget.edit.php - ui/widgets/problemhosts/views/widget.edit.php - ui/widgets/plaintext/views/widget.edit.php - ui/widgets/item/views/widget.edit.php - ui/widgets/hostavail/views/widget.edit.php - ui/widgets/graphprototype/views/widget.edit.php - ui/widgets/graph/views/widget.edit.php - ui/widgets/geomap/views/widget.edit.php - ui/widgets/dataover/views/widget.edit.php - ui/widgets/clock/views/widget.edit.php - ui/include/classes/html/widgets/CWidgetFieldMultiSelectView.php - ui/app/controllers/CControllerPopupGeneric.php
Showing diff toede58579477