Merge branch 'master' into cs-smalltalk

Browse Source

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

...

This commit is contained in:

Arfon Smith

2014-11-30 15:35:16 -06:00

parent bde19a76cc 55432774c7

commit 8c841903a5

235 changed files with 75473 additions and 72591 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

882

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff