Permalink
Browse files

Merge branch 'spec-activerecord' of github.com:winton/gem_template

Conflicts:
	config/gemsets.yml
	config/gemspec.yml
	spec/spec_helper.rb
  • Loading branch information...
2 parents d0182e8 + abaf261 commit 84cf0114085a97052f7479f4e120a236b473486c @winton committed Jan 3, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 84cf011

Please sign in to comment.