Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: CONTRIBUTING.md
This commit is contained in:
		
						commit
						b316d373ea
					
				@ -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/).
 | 
			
		||||
[](https://weblate.joinmastodon.org/)
 | 
			
		||||
 | 
			
		||||
</blockquote>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user