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

diff --cc Gemfile.lock
Simple merge

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/javascript/packs/public.js
Simple merge

diff --cc app/javascript/styles/mastodon/admin.scss
Simple merge

diff --cc app/views/stream_entries/_detailed_status.html.haml
Simple merge

diff --cc app/views/stream_entries/_simple_status.html.haml
Simple merge