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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/javascript/mastodon/actions/compose.js
Simple merge

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

diff --cc app/services/backup_service.rb
Simple merge

diff --cc app/services/remove_status_service.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge