From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 6 Nov 2019 13:38:28 +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=0ae7d8427394d5f98fb2bd78eaae9bf848831186;p=mastodon.git

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

Conflicts:
- `package.json`
---

0ae7d8427394d5f98fb2bd78eaae9bf848831186
diff --cc package.json
index 8a603a01e,a9c702166..581038b99
--- a/package.json
+++ b/package.json
@@@ -74,7 -73,7 +74,8 @@@
      "@babel/runtime": "^7.5.4",
      "@clusterws/cws": "^0.15.2",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
+     "arrow-key-navigation": "^1.0.2",
      "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.6",