diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-06 14:38:28 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-06 14:38:28 +0100 |
commit | 0ae7d8427394d5f98fb2bd78eaae9bf848831186 (patch) | |
tree | e15a6321eedcbf9a2ae55ce24e7d8960f233b5ef /CONTRIBUTING.md | |
parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
parent | 42d9ca21de298e1d51b87723745f2b17e4169894 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`
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 4019b1eed..522cc28ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -54,7 +54,7 @@ Bug reports and feature suggestions can be submitted to [GitHub Issues](https:// You can submit translations via [Crowdin](https://crowdin.com/project/mastodon). They are periodically merged into the codebase. -[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin] +[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)](https://crowdin.com/project/mastodon) ## Pull requests |