From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 26 Jan 2021 13:01:30 +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=b81710c02c9d8f27d417aa11b288a5b4e32bd5d5;p=mastodon.git

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.
---

b81710c02c9d8f27d417aa11b288a5b4e32bd5d5
diff --cc CONTRIBUTING.md
index a5b80c7e2,31f0a1319..4b2d1f3e8
--- a/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>