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

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/filters_controller.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/mastodon/locales/ja.json
Simple merge

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

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

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

diff --cc package.json
index 84dfb8a642671a2714402cb61492f0d097ed48a7,1fc2f375990a1fbf900bf54740a1e9ac8e708b01..15f6b39f9b4008dcdfb8f99678033031d243dab2
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -73,10 -72,9 +73,10 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.0.3",
      "array-includes": "^3.1.1",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
-     "axios": "^0.20.0",
+     "axios": "^0.21.0",
      "babel-loader": "^8.1.0",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",

diff --cc yarn.lock
Simple merge