Merge branch 'master' into i18n
This commit was merged in pull request #1105.
	This commit is contained in:
		@@ -14,7 +14,7 @@ GEM
 | 
			
		||||
    http_parser.rb (0.6.0)
 | 
			
		||||
    i18n (0.9.5)
 | 
			
		||||
      concurrent-ruby (~> 1.0)
 | 
			
		||||
    jekyll (3.7.4)
 | 
			
		||||
    jekyll (3.8.5)
 | 
			
		||||
      addressable (~> 2.4)
 | 
			
		||||
      colorator (~> 1.0)
 | 
			
		||||
      em-websocket (~> 0.5)
 | 
			
		||||
@@ -67,4 +67,4 @@ DEPENDENCIES
 | 
			
		||||
  tzinfo-data
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   2.0.2
 | 
			
		||||
   2.0.1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user