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

Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.

diff --cc CONTRIBUTING.md
index a5b80c7e2919ebfb637be2d37203e7f5b22dd806,31f0a1319ebd9d7f658b335e32416027132f3e09..4b2d1f3e84fcb479dcc0f653d08514d966c7c303
--- 1/CONTRIBUTING.md
--- 2/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@@ -70,6 -36,4 +70,6 @@@ The smaller the set of changes in the p
  
  ## Documentation
  
- The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/docs](https://source.joinmastodon.org/mastodon/docs).
+ The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to tootsuite/documentation](https://github.com/tootsuite/documentation).
 +
 +</blockquote>

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/lib/formatter.rb
Simple merge

diff --cc app/lib/sanitize_config.rb
Simple merge