Angelina Filippova fdb2b6d257 Merge branch 'develop' into 'feature/cache-invalidation' ... # Conflicts: # CHANGELOG.md # src/views/settings/components/Inputs.vue # src/views/settings/components/tabs.js		2020-07-27 22:29:37 +00:00
..
parseTuples.test.js	Add test for parsing options setting in MediaProxy.Invalidation.Http group	2020-07-20 12:56:01 +03:00
wrapUpdatedSettings.test.js	Add tests for wrappint settings with types that includes map	2020-07-20 15:42:43 +03:00