Merge branch 'master' into google-apps

Browse Source

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

...

This commit is contained in:

Arfon Smith

2014-11-30 21:11:59 -06:00

parent 410aace222 025bb35ac7

commit 9b22b2973f

215 changed files with 70870 additions and 74000 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

803

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff