Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream

2023-05-09 23:37:38 +02:00
parent 5aa08826cf 51b83ed195
commit facc7ab03c
31 changed files with 407 additions and 245 deletions
--- a/.prettierignore
+++ b/.prettierignore
@ -70,8 +70,6 @@ app/javascript/styles/mastodon/reset.scss
 # Ignore Javascript pending https://github.com/mastodon/mastodon/pull/23631
 *.js
 *.jsx
-*.ts
-*.tsx

 # Ignore HTML till cleaned and included in CI
 *.html