Merge branch 'master' into 891-update

Browse Source

Conflicts:
	lib/linguist/samples.json

...

This commit is contained in:

Arfon Smith

2014-04-21 11:09:06 -05:00

parent 20c9ed9f36 40f4c49ba9

commit 5af528184d

17 changed files with 9800 additions and 4 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

1546

lib/linguist/samples.json

File diff suppressed because it is too large Load Diff