Merge branch 'master' into licensee-6

github-linguist · Oct 23, 2015 · 9327268 · 9327268
2 parents 317219e + a35a3e9
commit 9327268
Show file tree

Hide file tree

Showing 5 changed files with 14,074 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 before_install: script/travis/before_install
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
@@ -720,7 +720,7 @@ Cython:
 
 D:
   type: programming
-  color: "#fcd46d"
+  color: "#ba595e"
   extensions:
   - .d
   - .di
@@ -1328,6 +1328,7 @@ HTML+Django:
   - .mustache
   - .jinja
   aliases:
+  - django
   - html+django/jinja
   - html+jinja
   - htmldjango
@@ -1701,6 +1702,7 @@ KiCad:
   type: programming
   extensions:
   - .sch
+  - .brd
   - .kicad_pcb
   tm_scope: none
   ace_mode: text

diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.6.4"
+  VERSION = "4.7.0"
 end
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     before_install: script/travis/before_install
     rvm:
-      - 1.9.3
       - 2.0.0
       - 2.1
       - 2.2
@@ Expand Down @@