Commits
Miks Kronkalns authored 8c57deed55fM
.......... [ZBXNEXT-5287,ZBXNEXT-5288] updated to latest from master; resolved conflicts in - frontends/php/app/controllers/CControllerPopupPreprocTestEdit.php (deleted file) - frontends/php/app/controllers/CControllerPopupPreprocTestSend.php (deleted file) - frontends/php/app/views/popup.preproctestedit.view.js.php (deleted file) - frontends/php/include/views/js/common.item.edit.js.php (keps our version)
Showing diff to3d6bb13ab9e