From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 18 Jan 2021 12:57:12 +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=e202314a75d3277c26f151764ff183d61dd2f9d0;p=mastodon.git

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

e202314a75d3277c26f151764ff183d61dd2f9d0
diff --cc package.json
index 98f8b6d83,001c38c9d..2e44cf4ed
--- a/package.json
+++ b/package.json
@@@ -71,9 -70,8 +71,9 @@@
      "@clusterws/cws": "^3.0.0",
      "@gamestdio/websocket": "^0.3.2",
      "@github/webauthn-json": "^0.5.7",
-     "@rails/ujs": "^6.1.0",
+     "@rails/ujs": "^6.1.1",
      "array-includes": "^3.1.2",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
      "axios": "^0.21.1",