Merge branch 'master' into 814

Browse Source

Conflicts:
	lib/linguist/languages.yml

...

This commit is contained in:

Arfon Smith

2014-06-06 09:55:08 -05:00

parent 5fb6f34d8a c1cf7ea825

commit 2a9ff0083c

365 changed files with 91403 additions and 2467 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

1170

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff