Merge branch 'master' of github.com:cutls/TheDesk
This commit is contained in:
		@@ -1,3 +1,4 @@
 | 
			
		||||
files:
 | 
			
		||||
  - source: /app/view/make/language/en/*.json
 | 
			
		||||
    translation: /app/view/make/language/%locale%/%file_name%.json
 | 
			
		||||
    update_option: update_as_unapproved
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user