Commits
Martins Talbergs authored 987279280f9
..F....... [ZBX-15585] resolved conflicts relating multiple retrieve modes (cherry picked from commit 24e86f2fd16cf668e888c8877bc8924221aee9c7) Conflicts: frontends/php/app/controllers/CControllerPopupHttpStep.php frontends/php/include/views/js/configuration.httpconf.edit.js.php