Commits
Gregory Chalenko authored 80f7fb71b4eM
.......... [ZBXNEXT-8760] updated to latest master; fixed conflicts in: - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_6050.c - ui/include/defines.inc.php - ui/include/classes/api/services/CUser.php - ui/include/classes/api/services/CUserDirectory.php - ui/tests/api_json/testUsers.php
Showing diff to5da9236b0c4