Commits
Andrejs Griščenko authored b66d91ef144M
.......... [ZBXNEXT-9546] updated to the latest from 'master'; resolved conflicts in: - create/src/schema.tmpl - sass/icons/dist/index.html - sass/icons/dist/zabbix-icons.css - sass/icons/dist/zabbix-icons.svg - sass/icons/dist/zabbix-icons.ttf - sass/icons/dist/zabbix-icons.woff - sass/icons/dist/zabbix-icons.woff2 - sass/stylesheets/sass/base/_icons.scss - src/libs/zbxdbupgrade/dbupgrade_7050.c - ui/assets/fonts/zabbix-icons.svg - ui/assets/fonts/zabbix-icons.ttf - ui/assets/fonts/zabbix-icons.woff - ui/assets/fonts/zabbix-icons.woff2 - ui/assets/styles/blue-classic-theme.css - ui/assets/styles/blue-theme.css - ui/assets/styles/dark-classic-theme.css - ui/assets/styles/dark-theme.css - ui/assets/styles/hc-dark.css - ui/assets/styles/hc-light.css - ui/include/classes/html/widgets/fields/CWidgetFieldTagsView.php - ui/include/defines.inc.php
Showing diff tofd487fbfcf2