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

Conflicts:
	db/schema.rb

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

..

bikes.rb

Closes #1

2013-04-04 22:27:54 -04:00

maps.example

git init

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

roles.rb

Changing UserRole to UserRoleJoin

2013-04-23 23:21:17 -04:00

user_profiles.rb

Almost usable, still a lot of work left

2012-12-31 15:38:34 -05:00

users.rb

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

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