Merge branch 'master' into associate-heuristic-with-extension

This commit is contained in:
Paul Chaignon
2015-07-04 22:48:06 +02:00
parent 8bf1defdc1
commit e688c865bc
50 changed files with 4387 additions and 55694 deletions

View File

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency 'charlock_holmes', '~> 0.7.3'
s.add_dependency 'escape_utils', '~> 1.1.0'
s.add_dependency 'mime-types', '>= 1.19'
s.add_dependency 'rugged', '~> 0.23.0b1'
s.add_dependency 'rugged', '>= 0.23.0b'
s.add_development_dependency 'minitest', '>= 5.0'
s.add_development_dependency 'mocha'