mirror of
				https://github.com/KevinMidboe/linguist.git
				synced 2025-10-29 17:50:22 +00:00 
			
		
		
		
	Merge branch 'master' into cache-bustin
This commit is contained in:
		@@ -958,7 +958,7 @@ HTML+Django:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
HTML+ERB:
 | 
					HTML+ERB:
 | 
				
			||||||
  type: markup
 | 
					  type: markup
 | 
				
			||||||
  tm_scope: text.html.erb
 | 
					  tm_scope: text.html.ruby
 | 
				
			||||||
  group: HTML
 | 
					  group: HTML
 | 
				
			||||||
  lexer: RHTML
 | 
					  lexer: RHTML
 | 
				
			||||||
  aliases:
 | 
					  aliases:
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user