From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 28 Dec 2019 16:48:40 +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=ad292792142a53fac05fac11e57ede103be2bdee;p=mastodon.git

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

Conflicts:
- `README.md`
- `package.json`
---

ad292792142a53fac05fac11e57ede103be2bdee
diff --cc package.json
index 6c059b7a5,5568f3c04..9e0c44550
--- a/package.json
+++ b/package.json
@@@ -65,13 -64,12 +65,13 @@@
      "@babel/plugin-proposal-decorators": "^7.7.4",
      "@babel/plugin-transform-react-inline-elements": "^7.7.4",
      "@babel/plugin-transform-runtime": "^7.7.6",
-     "@babel/preset-env": "^7.7.6",
+     "@babel/preset-env": "^7.7.7",
      "@babel/preset-react": "^7.7.4",
-     "@babel/runtime": "^7.7.6",
+     "@babel/runtime": "^7.7.7",
      "@gamestdio/websocket": "^0.3.2",
      "@clusterws/cws": "^0.16.0",
-     "array-includes": "^3.1.0",
+     "array-includes": "^3.1.1",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.1.0",
      "autoprefixer": "^9.7.3",
      "axios": "^0.19.0",