Merge branch 'master' into 1623-local

Conflicts:
	lib/linguist/heuristics.rb
This commit is contained in:
Arfon Smith
2014-11-02 19:58:50 -06:00
parent 49c2793bf5
commit 9d8ab16a38
20 changed files with 1552 additions and 24 deletions

View File

@@ -6,6 +6,7 @@ before_install:
rvm:
- 1.9.3
- 2.0.0
- 2.1.1
- 2.1
- 2.2
notifications:
disabled: true