From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 7 Jan 2020 15:28:59 +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=578553ba0583315751d0152344f6bdd3a1916dc9;p=mastodon.git

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

578553ba0583315751d0152344f6bdd3a1916dc9
diff --cc package.json
index 71cab74ab,75972be45..d72c9b93d
--- a/package.json
+++ b/package.json
@@@ -69,9 -68,8 +69,9 @@@
      "@babel/preset-react": "^7.7.4",
      "@babel/runtime": "^7.7.7",
      "@gamestdio/websocket": "^0.3.2",
-     "@clusterws/cws": "^0.16.1",
+     "@clusterws/cws": "^0.17.3",
      "array-includes": "^3.1.1",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.1.0",
      "autoprefixer": "^9.7.3",
      "axios": "^0.19.0",