diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-01-26 14:01:30 +0100 |
commit | b81710c02c9d8f27d417aa11b288a5b4e32bd5d5 (patch) | |
tree | 2f5ba10c2eb3c667dab2dfdb77c3d1724677ce87 /CONTRIBUTING.md | |
parent | d1255ab8a5101bc04af4a5214f975edf443a37d9 (diff) | |
parent | 7f1c56954b46b26b4dadfa92047f1ee5d7f9ad0a (diff) |
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.
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5b80c7e2..4b2d1f3e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,6 +70,6 @@ The smaller the set of changes in the pull request is, the quicker it can be rev ## 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> |