Zabbix

.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in:

#	ui/app/partials/configuration.hostgroup.edit.html.php
#	ui/app/partials/configuration.templategroup.edit.html.php
#	ui/app/views/administration.audit.settings.edit.php
#	ui/app/views/administration.authentication.edit.php
#	ui/app/views/administration.autoreg.edit.php
#	ui/app/views/administration.geomaps.edit.php
#	ui/app/views/administration.gui.edit.php
#	ui/app/views/administration.housekeeping.edit.php
#	ui/app/views/administration.iconmap.edit.php
#	ui/app/views/administration.image.edit.php
#	ui/app/views/administration.macros.edit.php
#	ui/app/views/administration.mediatype.edit.php
#	ui/app/views/administration.miscconfig.edit.php
#	ui/app/views/administration.module.edit.php
#	ui/app/views/administration.regex.edit.php
#	ui/app/views/administration.script.edit.php
#	ui/app/views/administration.trigdisplay.edit.php
#	ui/app/views/administration.user.edit.php
#	ui/app/views/administration.usergroup.edit.php
#	ui/app/views/administration.userrole.edit.php
#	ui/app/views/configuration.correlation.edit.php
#	ui/app/views/configuration.discovery.edit.php
#	ui/app/views/monitoring.dashboard.widget.edit.php
#	ui/app/views/popup.condition.common.php
#	ui/app/views/popup.import.php
#	ui/app/views/popup.massupdate.host.php
#	ui/app/views/popup.massupdate.item.php
#	ui/app/views/popup.massupdate.template.php
#	ui/app/views/popup.massupdate.trigger.php
#	ui/app/views/popup.token.edit.php
#	ui/app/views/popup.token.view.php
#	ui/app/views/reports.scheduledreport.edit.php
#	ui/include/classes/widgets/CWidgetHelper.php
#	ui/include/classes/widgets/fields/CWidgetFieldGraphDataSet.php
#	ui/include/classes/widgets/forms/CWidgetFormGraph.php
#	ui/include/classes/widgets/forms/CWidgetFormGraphPrototype.php
#	ui/include/classes/widgets/forms/CWidgetFormItem.php
#	ui/include/classes/widgets/forms/CWidgetFormPlainText.php
#	ui/include/classes/widgets/forms/CWidgetFormSlaReport.php
#	ui/include/classes/widgets/forms/CWidgetFormUrl.php
#	ui/include/classes/widgets/views/widget.svggraph.form.view.php
#	ui/include/views/configuration.action.edit.php
#	ui/include/views/configuration.action.list.php
#	ui/include/views/configuration.copy.elements.php
#	ui/include/views/configuration.graph.edit.php
#	ui/include/views/configuration.host.discovery.edit.php
#	ui/include/views/configuration.host.prototype.edit.php
#	ui/include/views/configuration.httpconf.edit.php
#	ui/include/views/configuration.item.edit.php
#	ui/include/views/configuration.item.prototype.edit.php
#	ui/include/views/configuration.maintenance.edit.php
#	ui/include/views/configuration.template.edit.php
#	ui/include/views/configuration.trigger.prototype.edit.php
#	ui/include/views/configuration.triggers.edit.php
#	ui/include/views/inventory.host.view.php