Commits
Roberts Lataria authored b81c2d59b45M
.......... [DEV-1785] merged from upstream; conflicts resolved; Conflicts: create/src/schema.tmpl src/libs/zbxdbupgrade/dbupgrade_5030.c ui/app/controllers/CControllerFavouriteCreate.php ui/app/controllers/CControllerFavouriteDelete.php ui/include/classes/api/services/CHttpTest.php ui/include/classes/api/services/CScreen.php ui/include/classes/api/services/CScreenItem.php ui/include/classes/core/CJsonRpc.php ui/include/classes/widgets/CWidgetConfig.php ui/include/defines.inc.php ui/include/views/monitoring.screen.constructor.edit.php ui/tests/api_json/data/data_test.sql ui/tests/api_json/testWebScenario.php ui/tests/unit/include/classes/api/clients/CLocalApiClientTest.php
Showing diff to685eb3b308c