Merge branch 'master' into 675-local

Browse Source

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

...

This commit is contained in:

Arfon Smith

2014-06-20 12:22:58 +01:00

parent 6d5da4c9ec 62bc6f0457

commit 0758c05186

443 changed files with 117062 additions and 2411 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

1436

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff