Merge branch 'master' into cool

Browse Source

Conflicts:
	lib/linguist/heuristics.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

...

This commit is contained in:

Arfon Smith

2014-11-30 15:23:09 -06:00

parent 913cd6c309 55432774c7

commit 212c74d8a3

376 changed files with 89012 additions and 66833 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

1028

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff