From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 12 Feb 2021 09:28:32 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5e11f3a6e1de864da8a7e694f18eaa3b5e4c7379;p=mastodon.git

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

Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
---

5e11f3a6e1de864da8a7e694f18eaa3b5e4c7379
diff --cc package.json
index 4cebdda02,7ff777b7b..a3f85500e
--- 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.1",
+     "@rails/ujs": "^6.1.2",
      "array-includes": "^3.1.2",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.6",
      "axios": "^0.21.1",