Files
linguist/.gitignore
Arfon Smith 9e50e188a8 Merge branch 'master' into 1233-local
Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json
2014-11-01 10:04:22 -05:00

5 lines
59 B
Plaintext

Gemfile.lock
.bundle/
benchmark/
lib/linguist/samples.json