Permalink
Browse files

Merge branch 'connect' of github.com:strangeloop/site into connect

Conflicts:
	Gemfile.lock
	app/models/attendee.rb
	db/schema.rb
	spec/factories.rb
	spec/models/attendee_spec.rb
  • Loading branch information...
2 parents 946d948 + a3ac1b7 commit 7572fa46362111a412ede11b250ceb95e124b13f @marioaquino marioaquino committed Aug 14, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 7572fa4

Please sign in to comment.