Merge branch 'master' into fish

Browse Source

Conflicts:
	grammars.yml
	lib/linguist/languages.yml

...

This commit is contained in:

Arfon Smith

2014-12-12 11:22:24 -06:00

parent 6d190d7d7c a5e6d37049

commit 707fcd29ea

69 changed files with 1767 additions and 1139 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

349

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff