Merge branch 'master' into 1233-local

Browse Source

Conflicts:
	lib/linguist/language.rb

...

This commit is contained in:

Arfon Smith

2014-11-01 10:05:45 -05:00

parent 9e50e188a8 e8cf750e18

commit 2bc546eadf

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

Diff Content Not Available