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

Conflicts:
	db/schema.rb

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

..

devise

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

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

layouts

Adjusting how javascript is loaded

2013-05-25 10:12:03 -04:00

users

Add users resources and paginate users index

2012-12-17 22:24:31 -05:00