Commits
Vladimirs Maksimovs authored 9a9b8760084M
.......... [ZBXNEXT-82] updated to latest from /master; resolved conflicts in: # create/src/schema.tmpl # include/dbschema.h # src/libs/zbxdbupgrade/dbupgrade_5010.c # ui/app/controllers/CControllerGuiEdit.php # ui/app/controllers/CControllerGuiUpdate.php # ui/applications.php # ui/include/defines.inc.php # ui/include/profiles.inc.php # ui/include/schema.inc.php # ui/templates.php
Showing diff to7b8c6a86d69