Merge branch 'master' into 820-local

Browse Source

Conflicts:
	lib/linguist/samples.json

...

This commit is contained in:

Arfon Smith

2014-06-20 12:37:20 +01:00

parent aa78060e41 8cb736adfa

commit 62bd96a778

389 changed files with 112833 additions and 6660 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

1161

lib/linguist/languages.yml

File diff suppressed because it is too large Load Diff