Merge branch 'master' into revert-2014-revert-1976-path-for-fileblob

Conflicts:
	lib/linguist/version.rb
This commit is contained in:
Arfon Smith
2015-02-24 14:54:14 -06:00
124 changed files with 15649 additions and 615 deletions

View File

@@ -1,3 +1,3 @@
module Linguist
VERSION = "4.3.0b1"
VERSION = "4.5.0b1"
end