John N. Milner c5b16139f5 Merge branch 'master' into denney-new-user-form ...

Conflicts:
	db/schema.rb

2013-05-30 22:03:53 -04:00

..

confirmations

git init

2012-12-04 00:46:15 -05:00

mailer

git init

2012-12-04 00:46:15 -05:00

passwords

git init

2012-12-04 00:46:15 -05:00

registrations

Auth by username instead of email

2013-05-25 11:08:58 -04:00

sessions

Merge branch 'master' into denney-new-user-form

2013-05-30 22:03:53 -04:00

unlocks

git init

2012-12-04 00:46:15 -05:00

_links.erb

git init

2012-12-04 00:46:15 -05:00