Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: CONTRIBUTING.md
7 years ago · ecdfcbf266
parent ec2dc881dd e38c51da92
commit ecdfcbf266
1 changed files with 5 additions and 0 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -83,4 +83,9 @@ It is expected that you have a working development environment set up (see back-

 If the JavaScript or CSS assets won't compile due to a syntax error, it's a good sign that the pull request isn't ready for submission yet.

+## Translate
+
+You can contribute to translating Mastodon via Weblate at [weblate.joinmastodon.org](https://weblate.joinmastodon.org/).
+[![Mastodon translation statistics by language](https://weblate.joinmastodon.org/widgets/mastodon/-/multi-auto.svg)](https://weblate.joinmastodon.org/)
+
 </blockquote>