Merge branch 'master' into 1233-local

Browse Source

Conflicts:
	lib/linguist/language.rb
	lib/linguist/languages.yml
	lib/linguist/samples.json

...

This commit is contained in:

Arfon Smith

2014-11-01 09:59:29 -05:00

parent 12b78c5357

commit 9e50e188a8

77 changed files with 3066 additions and 74080 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

BIN

vendor/cache/coderay-1.1.0.gem vendored Normal file

Binary file not shown.