Skip to content

Commit

Permalink
Merge branch 'master' into phase2_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rdvdijk committed Oct 1, 2012
2 parents 121fabc + 9f75c12 commit b81c8aa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 51 deletions.
44 changes: 0 additions & 44 deletions Gemfile.lock

This file was deleted.

14 changes: 7 additions & 7 deletions neography.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_development_dependency "rspec"
s.add_development_dependency "rspec", ">= 2.0"
s.add_development_dependency "net-http-spy", "0.2.1"
s.add_development_dependency "rake"
s.add_development_dependency "rake", ">= 0.8.7"
s.add_dependency "httparty", ">= 0.8.1"
s.add_dependency "rake"
s.add_dependency "json"
s.add_dependency "os"
s.add_dependency "rubyzip"
s.add_dependency "multi_json"
s.add_dependency "rake", ">= 0.8.7"
s.add_dependency "json", ">= 1.6.0"
s.add_dependency "os", ">= 0.9.6"
s.add_dependency "rubyzip", ">= 0.9.7"
s.add_dependency "multi_json", ">= 1.3.2"
end

0 comments on commit b81c8aa

Please sign in to comment.