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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/lib/settings/scoped_settings.rb
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc app/models/status.rb
Simple merge

diff --cc package.json
index 98f8b6d83ff69d57c4a26e31e2e495a199a540be,001c38c9df81ea04b655548938352477a3306911..2e44cf4ed8773d77cb74b255dd012c5fd2143ff4
--- 1/package.json
--- 2/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",

diff --cc yarn.lock
Simple merge