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

Conflicts:
	db/schema.rb

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

..

acceptance

git init

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

controllers

git init

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

factories

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

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

models

git init

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

requests/devise

git init

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

support

git init

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

factories.rb

Added user roles and authentication, sign in/out

2012-12-29 16:22:24 -05:00

spec_helper.rb

git init

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