Permalink
Browse files

Merge branch 'master' into spec-activerecord

Conflicts:
	require.rb
  • Loading branch information...
2 parents 865176f + 77271f3 commit 05d6e03e845afb306c2779cdc14e7d24b14e5d9d @winton committed Mar 11, 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.5'
+ gem :require, '=0.2.6'
gem(:rake, '=0.8.7') { require 'rake' }
gem :rspec, '=1.3.0'

0 comments on commit 05d6e03

Please sign in to comment.