Merge branch 'master' into cache-bustin

This commit is contained in:
Arfon Smith
2014-10-16 12:59:41 -05:00

View File

@@ -958,7 +958,7 @@ HTML+Django:
HTML+ERB:
type: markup
tm_scope: text.html.erb
tm_scope: text.html.ruby
group: HTML
lexer: RHTML
aliases: