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

diff --cc Vagrantfile
Simple merge

diff --cc app/javascript/core/admin.js
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 config/locales/en.yml
Simple merge