From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 30 Nov 2019 16:29:44 +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=2b7158427f5a80728dfc04913a4d7a78471a1703;p=mastodon.git

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

2b7158427f5a80728dfc04913a4d7a78471a1703
diff --cc package.json
index 545c5f731,27ecc45a2..99a80b8ee
--- a/package.json
+++ b/package.json
@@@ -64,17 -63,16 +64,17 @@@
      "@babel/plugin-proposal-class-properties": "^7.7.0",
      "@babel/plugin-proposal-decorators": "^7.7.0",
      "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-     "@babel/plugin-transform-react-inline-elements": "^7.2.0",
-     "@babel/plugin-transform-react-jsx-self": "^7.2.0",
+     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+     "@babel/plugin-transform-react-inline-elements": "^7.7.4",
+     "@babel/plugin-transform-react-jsx-self": "^7.7.4",
      "@babel/plugin-transform-react-jsx-source": "^7.5.0",
-     "@babel/plugin-transform-runtime": "^7.5.5",
-     "@babel/preset-env": "^7.7.1",
+     "@babel/plugin-transform-runtime": "^7.7.4",
+     "@babel/preset-env": "^7.7.4",
      "@babel/preset-react": "^7.7.0",
-     "@babel/runtime": "^7.7.2",
+     "@babel/runtime": "^7.7.4",
      "@clusterws/cws": "^0.16.0",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.0.2",
      "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",