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

diff --cc Gemfile.lock
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge