From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 3 Nov 2020 16:28:54 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cd675fbe18bbd9e8c6c0fe9ffb6b3037282cd6c9;p=mastodon.git

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

cd675fbe18bbd9e8c6c0fe9ffb6b3037282cd6c9
diff --cc package.json
index 84dfb8a64,1fc2f3759..15f6b39f9
--- a/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",