Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into spec-activerecord

Conflicts:
	config/gemsets.yml
  • Loading branch information...
commit b51a78aba9a32add695152b1698da8533cb1beae 2 parents 2800b11 + 11fdcaf
@winton authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 config/gemsets.yml
View
4 config/gemsets.yml
@@ -1,5 +1,5 @@
gem_template:
rake: >=0.8.7
- rspec: <2
+ rspec: ~>1.0
default:
- active_wrapper: =0.3.4
+ active_wrapper: =0.3.4

0 comments on commit b51a78a

Please sign in to comment.
Something went wrong with that request. Please try again.