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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

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

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

diff --cc config/locales/en.yml
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge