Merge branch 'master' into 'cleanup'

# Conflicts: # src/components/common/LocaleSelector.tsx
2021-07-05 10:17:57 +00:00
parent 9deeea3884 b2d73f2382
commit c4b9950514
28 changed files with 322 additions and 208 deletions
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
    "@tippyjs/react": "^4.2.5",
    "@traptitech/markdown-it-katex": "^3.4.3",
    "@traptitech/markdown-it-spoiler": "^1.1.6",
+    "@trivago/prettier-plugin-sort-imports": "^2.0.2",
    "@types/lodash.defaultsdeep": "^4.6.6",
    "@types/lodash.isequal": "^4.5.5",
    "@types/markdown-it": "^12.0.2",