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

2023-04-03 17:40:59 +02:00
parent 8192b0da7c 77bd32a26a
commit 4d5b4dacd6
159 changed files with 3636 additions and 1965 deletions
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -132,6 +132,7 @@ export const useBlurhash = getMeta('use_blurhash');
 export const usePendingItems = getMeta('use_pending_items');
 export const version = getMeta('version');
 export const languages = initialState?.languages;
+// @ts-expect-error
 export const statusPageUrl = getMeta('status_page_url');

 // Glitch-soc-specific settings