Merge branch 'master' into 1036-local

2025-10-29 17:50:22 +00:00 · 2014-10-29 20:06:40 -05:00
parent d4d6ef314d 213fce00e0
commit 0c05a6c3ac
3 changed files with 6 additions and 3 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -962,7 +962,6 @@ Groovy:
  color: "#e69f56"
  extensions:
  - .groovy
-  - .gradle
  - .grt
  - .gtpl
  - .gvy
@@ -1001,7 +1000,7 @@ HTML+Django:

 HTML+ERB:
  type: markup
-  tm_scope: text.html.ruby
+  tm_scope: text.html.erb
  group: HTML
  lexer: RHTML
  aliases:
@@ -1571,6 +1570,8 @@ MoonScript:
  type: programming
  extensions:
  - .moon
+  interpreters:
+  - moon

 Myghty:
  extensions:
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "3.4.0"
+  VERSION = "3.4.1"
 end