Commits
Andris Mednis authored 6d686ea4d17M
.......... [ZBXNEXT-1263] updated to the latest trunk Resolved conflicts in: create/src/schema.tmpl frontends/php/app/controllers/CControllerProxyCreate.php frontends/php/app/controllers/CControllerProxyEdit.php frontends/php/app/controllers/CControllerProxyUpdate.php frontends/php/hosts.php frontends/php/include/defines.inc.php frontends/php/include/schema.inc.php src/libs/zbxdbupgrade/dbupgrade_2050.c
Showing diff to00a7ca9d0f5