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
..
en.js	Merge branch 'develop' into 'feature/cache-invalidation'	2020-07-27 22:29:37 +00:00
es.js	Move element-ui components to the separate folder	2019-11-29 22:45:24 +09:00
index.js	Linter fixes	2019-08-14 10:24:51 +00:00
oc.js	Move element-ui components to the separate folder	2019-11-29 22:45:24 +09:00
zh.js	Move element-ui components to the separate folder	2019-11-29 22:45:24 +09:00