Merge branch 'main' into glitch-soc/merge-upstream

2021-05-10 21:45:32 +02:00
parent fc8baba8cb d279666bd4
commit 7ac8bcf209
55 changed files with 652 additions and 425 deletions
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -3270,4 +3270,4 @@
    ],
    "path": "app/javascript/mastodon/features/video/index.json"
  }
-]
+]