Merge branch 'master' into 1233-local

Conflicts: lib/linguist/language.rb lib/linguist/languages.yml lib/linguist/samples.json
2026-01-09 10:55:32 +00:00 · 2014-11-01 09:59:29 -05:00
parent 12b78c5357
commit 9e50e188a8
77 changed files with 3066 additions and 74080 deletions
--- a/vendor/cache/charlock_holmes-0.7.3.gem
+++ b/vendor/cache/charlock_holmes-0.7.3.gem
--- a/vendor/cache/coderay-1.1.0.gem
+++ b/vendor/cache/coderay-1.1.0.gem
--- a/vendor/cache/escape_utils-1.0.1.gem
+++ b/vendor/cache/escape_utils-1.0.1.gem
--- a/vendor/cache/json-1.8.1.gem
+++ b/vendor/cache/json-1.8.1.gem
--- a/vendor/cache/metaclass-0.0.4.gem
+++ b/vendor/cache/metaclass-0.0.4.gem
--- a/vendor/cache/method_source-0.8.2.gem
+++ b/vendor/cache/method_source-0.8.2.gem
--- a/vendor/cache/mime-types-1.25.1.gem
+++ b/vendor/cache/mime-types-1.25.1.gem
--- a/vendor/cache/mocha-1.1.0.gem
+++ b/vendor/cache/mocha-1.1.0.gem
--- a/vendor/cache/posix-spawn-0.3.9.gem
+++ b/vendor/cache/posix-spawn-0.3.9.gem
--- a/vendor/cache/pry-0.10.1.gem
+++ b/vendor/cache/pry-0.10.1.gem
--- a/vendor/cache/pygments.rb-0.6.0.gem
+++ b/vendor/cache/pygments.rb-0.6.0.gem
--- a/vendor/cache/rake-10.3.2.gem
+++ b/vendor/cache/rake-10.3.2.gem
--- a/vendor/cache/rugged-0.21.1b2.gem
+++ b/vendor/cache/rugged-0.21.1b2.gem
--- a/vendor/cache/slop-3.6.0.gem
+++ b/vendor/cache/slop-3.6.0.gem
--- a/vendor/cache/yajl-ruby-1.1.0.gem
+++ b/vendor/cache/yajl-ruby-1.1.0.gem