Commits

Martins Talbergs authored e0fe371713dM
.......... [ZBXNEXT-7689] Merge branch 'master' into feature/ZBXNEXT-7689-7.1 Conflicts: create/src/schema.tmpl src/libs/zbxdbupgrade/dbupgrade_7010.c 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/defines.inc.php ui/tests/selenium/dashboards/testDashboardsTemplatedDashboardForm.php ui/tests/selenium/users/testFormUserPermissions.php
Showing diff toa3fc18c8bbe