Commits
Andrejs Griščenko authored 45df0dcbdd4M
.......... [ZBXNEXT-10357] updated to the latest from 'master'; resolved conflicts in: - ui/app/controllers/CControllerMediatypeCreate.php - ui/app/controllers/CControllerUserroleEdit.php - ui/include/classes/api/clients/CLocalApiClient.php - ui/include/classes/api/services/CMediatype.php - ui/include/classes/api/services/CRole.php - ui/include/classes/core/CConfigFile.php
Showing diff tobcc5748e046