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

Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

diff --cc lib/mastodon/version.rb
Simple merge

diff --cc package.json
index bea3fc6ea97370125540baeb2ce8e249891ef38e,b2d27b5670c9dd9325e36f09986c90cbe334f27f..47ce3f42193e2e21723737451260f4eff97c1c57
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,9 -71,8 +72,9 @@@
      "@gamestdio/websocket": "^0.3.2",
      "@rails/ujs": "^6.0.3",
      "array-includes": "^3.1.1",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
-     "autoprefixer": "^9.8.0",
+     "autoprefixer": "^9.8.5",
      "axios": "^0.19.2",
      "babel-loader": "^8.1.0",
      "babel-plugin-lodash": "^3.3.4",

diff --cc yarn.lock
index 2c51161d0cfe610537caf4c6117b0581ec9fde0b,d8685a509780ea9b499a376ea060c58910486f95..a2d336019062edb5894efe0d636c91fb70b84478
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -2191,22 -2017,17 +2017,22 @@@ atob@^2.1.2
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
- autoprefixer@^9.8.0:
-   version "9.8.0"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
-   integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
 +atrament@0.2.4:
 +  version "0.2.4"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.4.tgz#6f78196edfcd194e568b7c0b9c88201ec371ac66"
 +  integrity sha512-hSA9VwW6COMwvRhSEO4uZweZ91YGOdHqwvslNyrJZG+8mzc4qx/qMsDZBuAeXFeWZO/QKtRjIXguOUy1aNMl3A==
 +
+ autoprefixer@^9.8.5:
+   version "9.8.5"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa"
+   integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==
    dependencies:
      browserslist "^4.12.0"
-     caniuse-lite "^1.0.30001061"
-     chalk "^2.4.2"
+     caniuse-lite "^1.0.30001097"
+     colorette "^1.2.0"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"
-     postcss "^7.0.30"
+     postcss "^7.0.32"
      postcss-value-parser "^4.1.0"
  
  aws-sign2@~0.7.0: