Commits
Andrejs Griščenko authored 12e53d6f8e4M
.......... [DEV-2060] updated to the latest from 'master'; resolved conflicts in: - sass/stylesheets/sass/layout/_form-grid.scss - ui/app/views/popup.httpstep.php - ui/assets/styles/blue-theme.css - ui/assets/styles/dark-theme.css - ui/assets/styles/hc-dark.css - ui/assets/styles/hc-light.css - ui/include/views/configuration.httpconf.edit.php - ui/include/views/js/configuration.httpconf.edit.js.php
Showing diff to9b5c1e34c70