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

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/ja.json
Simple merge

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

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc package.json
index 67230b845cbcfae6cd8de665a0fdb4e88dd5a16a,5bc1f6bf3ce02401b10de8cb8799b7374494a993..b1f904faf1eb43efe550e059747c4d2ca814e4f5
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -95,10 -93,9 +95,10 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
 +    "favico.js": "^0.3.10",
      "file-loader": "^6.2.0",
      "font-awesome": "^4.7.0",
-     "glob": "^7.1.6",
+     "glob": "^7.1.7",
      "history": "^4.10.1",
      "http-link-header": "^1.0.3",
      "immutable": "^3.8.2",

diff --cc yarn.lock
Simple merge