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

Conflicts:
- `package.json`

diff --cc CONTRIBUTING.md
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
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/packs/public.js
Simple merge

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

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

diff --cc app/views/public_timelines/show.html.haml
Simple merge

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

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index 8a603a01e61f735d490a89131340be8611abfade,a9c702166d72b711506f71b775c017976e8504fc..581038b9946a3f4cc2d11b666f2e1741f68b62cc
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -74,7 -73,7 +74,8 @@@
      "@babel/runtime": "^7.5.4",
      "@clusterws/cws": "^0.15.2",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
+     "arrow-key-navigation": "^1.0.2",
      "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.6",

diff --cc yarn.lock
Simple merge