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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

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

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

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

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

diff --cc app/models/media_attachment.rb
Simple merge

diff --cc app/views/admin/custom_emojis/index.html.haml
Simple merge

diff --cc app/views/admin/tags/index.html.haml
Simple merge

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

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
Simple merge