Permalink
Browse files

Merge branch 'master' into spec-activerecord

Conflicts:
	require.rb
  • Loading branch information...
2 parents f4714dc + 21641a4 commit 865176fe7d59da89c4a205fa7f56c9823eeb6808 @winton committed Mar 10, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 require.rb
View
@@ -4,7 +4,7 @@
Require do
gem(:active_wrapper, '=0.2.3') { require 'active_wrapper' }
- gem :require, '=0.2.2'
+ gem :require, '=0.2.5'
gem(:rake, '=0.8.7') { require 'rake' }
gem :rspec, '=1.3.0'

0 comments on commit 865176f

Please sign in to comment.