Commits
Ginta Berzina authored fd9aa9ee3a2M
.......... [ZBXNEXT-8788] updated to latest from master; resolved conflicts in - ui/app/controllers/CControllerPopupScheduledReportCreate.php - ui/app/controllers/CControllerPopupScheduledReportEdit.php - ui/app/partials/js/scheduledreport.formgrid.js.php - ui/app/partials/scheduledreport.formgrid.html.php - ui/app/views/js/popup.scheduledreport.edit.js.php - ui/app/views/popup.scheduledreport.edit.php - ui/tests/selenium/permissions/testPermissionsWithoutCSRF.php
Showing diff toab2f6854596