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

Conflicts:
 	CONTRIBUTING.md
This commit is contained in:
David Yip 2018-05-04 12:16:12 -05:00
commit b316d373ea
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC

View File

@ -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. 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> </blockquote>