Commits
Martins Talbergs authored 3befdbf298fM
.......... [ZBXNEXT-5486] resolved all conflicts Conflicts: create/src/schema.tmpl frontends/php/app/views/administration.gui.edit.php frontends/php/app/views/administration.housekeeping.edit.php frontends/php/app/views/administration.iconmap.edit.php frontends/php/app/views/administration.iconmap.list.php frontends/php/app/views/administration.image.list.php frontends/php/app/views/administration.macros.edit.php frontends/php/app/views/administration.miscconfig.edit.php frontends/php/app/views/administration.regex.edit.php frontends/php/app/views/administration.regex.list.php frontends/php/app/views/administration.trigdisplay.edit.php frontends/php/app/views/administration.trigseverity.edit.php frontends/php/app/views/administration.valuemap.edit.php frontends/php/app/views/administration.valuemap.list.php frontends/php/app/views/administration.workingtime.edit.php frontends/php/include/classes/mvc/CRouter.php frontends/php/include/defines.inc.php frontends/php/include/html.inc.php frontends/php/include/views/administration.general.image.edit.php frontends/php/tests/selenium/testFormAdministrationGeneralGUI.php frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php frontends/php/tests/selenium/testFormAdministrationGeneralImages.php frontends/php/tests/selenium/testFormAdministrationGeneralMacro.php frontends/php/tests/selenium/testFormAdministrationGeneralOtherParams.php frontends/php/tests/selenium/testFormAdministrationGeneralRegexp.php frontends/php/tests/selenium/testFormAdministrationGeneralValuemap.php frontends/php/tests/selenium/testFormItem.php frontends/php/tests/selenium/testPageAdministrationGeneralIconMapping.php frontends/php/tests/selenium/testPageAdministrationGeneralImages.php frontends/php/tests/selenium/testPageAdministrationGeneralRegexp.php src/libs/zbxdbupgrade/dbupgrade_4050.c
Showing diff to0468991b13a