From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 10 May 2021 19:45:32 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7ac8bcf209cd2d72883ee3e5cfa7853620e417da;p=mastodon.git

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

7ac8bcf209cd2d72883ee3e5cfa7853620e417da
diff --cc package.json
index 67230b845,5bc1f6bf3..b1f904faf
--- a/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",