Commits
Ivo Kurzemnieks authored 2883ba297f2M
.......... [ZBXNEXT-4087,ZBXNEXT-4854] updated to latest from /trunk and resolved conflicts in data_test.sql, configuration.host.discovery.edit.php and C40ImportConverterTest.php (unchanged, since the fix was duplicated here)
Showing diff to0bb3482c166