Merge branch 'master' into tst

Browse Source

Conflicts:
	lib/linguist/heuristics.rb
	lib/linguist/language.rb
	lib/linguist/languages.yml

...

This commit is contained in:

Arfon Smith

2015-01-23 14:35:27 -06:00

parent f9ad5dda56 cc56ddb354

commit d95b7504ab

403 changed files with 27511 additions and 1739 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

607

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff