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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/about_controller.rb
Simple merge

diff --cc app/controllers/accounts_controller.rb
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/presenters/instance_presenter.rb
Simple merge

diff --cc app/serializers/rest/instance_serializer.rb
Simple merge

diff --cc app/views/about/more.html.haml
Simple merge

diff --cc config/navigation.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index a3f85500e6e3cc1a75176d3a1e882672fa27d80a,780b390c6a14240ab20618d392dddf5a9527d8bb..e81844964be2896bf73041b305b2d5c15ef24471
--- 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.2",
+     "@rails/ujs": "^6.1.3",
      "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