From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 14 Sep 2021 11:50:30 +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=f1e6884d6bee3b4e426863c63c8d81e940d21a20;p=mastodon.git

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

f1e6884d6bee3b4e426863c63c8d81e940d21a20
diff --cc package.json
index 312b06bd8,0b0a4764d..56a94873b
--- a/package.json
+++ b/package.json
@@@ -72,10 -71,9 +72,10 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.3",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
-     "axios": "^0.21.1",
+     "axios": "^0.21.4",
      "babel-loader": "^8.2.2",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",