Commits
Alexander Shubin authored 5cafb13c76bM
.......... [ZBXNEXT-9057] updated to latest master; conflicts resolved in: # 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 # 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-theme.css # ui/assets/styles/dark-theme.css # ui/assets/styles/hc-dark.css # ui/assets/styles/hc-light.css # ui/include/classes/helpers/CSettingsHelper.php
Showing diff toee78b5c4a1c