Merge branch 'master' into 815-update

Browse Source

Conflicts:
	lib/linguist/samples.json

...

This commit is contained in:

Arfon Smith

2014-05-30 15:38:55 -05:00

parent 72fab07a14 adbf4f6b17

commit 4fefe2020f

171 changed files with 59592 additions and 694 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

873

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff