Skip to content
This repository
Browse code

Merge branch 'master' into spec-activerecord

Conflicts:
	config/gemsets.yml
  • Loading branch information...
commit b51a78aba9a32add695152b1698da8533cb1beae 2 parents 2800b11 + 11fdcaf
Winton Welsh authored

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. +2 2 config/gemsets.yml
4 config/gemsets.yml
... ... @@ -1,5 +1,5 @@
1 1 gem_template:
2 2 rake: >=0.8.7
3   - rspec: <2
  3 + rspec: ~>1.0
4 4 default:
5   - active_wrapper: =0.3.4
  5 + active_wrapper: =0.3.4

0 comments on commit b51a78a

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