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

@@ -1,2 +1,3 @@
source 'https://rubygems.org'
gemspec
gem 'test-unit', require: false if RUBY_VERSION >= '2.2'