Merge branch 'master' into 1036-local

Browse Source

Conflicts:
	lib/linguist/heuristics.rb
	lib/linguist/languages.yml
	test/test_heuristics.rb

...

This commit is contained in:

Arfon Smith

2014-11-25 13:06:11 -06:00

parent 0c05a6c3ac 7cbc4bc144

commit 8de2cd15ed

116 changed files with 6266 additions and 574 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/json-1.8.1.gem vendored

Binary file not shown.

BIN

vendor/cache/mime-types-1.25.1.gem vendored

Binary file not shown.

BIN

vendor/cache/mime-types-2.4.3.gem vendored Normal file

Binary file not shown.

BIN

vendor/cache/plist-3.1.0.gem vendored Normal file

Binary file not shown.

BIN

vendor/cache/posix-spawn-0.3.9.gem vendored

Binary file not shown.

BIN

vendor/cache/pygments.rb-0.6.0.gem vendored

Binary file not shown.

BIN

vendor/cache/rugged-0.21.1b2.gem vendored

Binary file not shown.

BIN

vendor/cache/rugged-0.22.0b4.gem vendored Normal file

Binary file not shown.