Angelina Filippova 411606dc69 Merge branch 'develop' into 'feature/hide-proxy-remote' ... # Conflicts: # CHANGELOG.md		2021-03-11 19:57:05 +00:00
..
modules/normalizers	Add test for wrapping settings with type [list, map]	2020-11-29 20:58:21 +03:00
views	Merge branch 'develop' into 'feature/hide-proxy-remote'	2021-03-11 19:57:05 +00:00