Merge branch 'master' into 1035

Browse Source

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

...

This commit is contained in:

Arfon Smith

2014-06-03 22:03:59 -05:00

parent a3aaa1ec4d 38a3714514

commit 98f35aefdc

269 changed files with 75150 additions and 806 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

972

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff