Commits
Miks Kronkalns authored 082415f64c9M
.......... [ZBXNEXT-276] updated to latest from master. Resolved conflicts in: - create/src/schema.tmpl - ui/app/controllers/CControllerPopupGeneric.php - ui/app/controllers/CControllerUserEdit.php - ui/app/controllers/CControllerUserProfileEdit.php - ui/app/views/administration.user.edit.php - ui/include/classes/api/services/CUserDirectory.php - ui/include/schema.inc.php - ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
Showing diff to3aafff6f9f4