Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/jasiek/80legs
Browse files Browse the repository at this point in the history
  • Loading branch information
ryana committed Nov 4, 2011
2 parents b7c54f7 + a760ced commit 8a0956c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'rake'


group :development do group :development do
gem "shoulda", ">= 0" gem "shoulda", ">= 0"
gem "bundler", "~> 1.0.0" gem "bundler", ">= 1.0.0"
gem "jeweler", "~> 1.6.4" gem "jeweler", "~> 1.6.4"
gem "rcov", ">= 0" gem "rcov", ">= 0"
end end
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ PLATFORMS
ruby ruby


DEPENDENCIES DEPENDENCIES
bundler (~> 1.0.0) bundler (>= 1.0.0)
jeweler (~> 1.6.4) jeweler (~> 1.6.4)
rake (= 0.8.7) rake
rcov rcov
shoulda shoulda
2 changes: 1 addition & 1 deletion VERSION
Original file line number Original file line Diff line number Diff line change
@@ -1 +1 @@
0.2.1 0.2.2

0 comments on commit 8a0956c

Please sign in to comment.