Will Bradley 0bc5858101 Merged more conflicts

2012-09-15 17:44:30 -07:00

..

devise

Finished adding user profile stuff

2012-09-03 21:56:37 -07:00

door_logs

Merged more conflicts

2012-09-15 17:44:30 -07:00

home

Installed Devise and created a home controller/route

2012-09-02 02:57:34 -07:00

layouts

Merged more conflicts

2012-09-15 17:44:30 -07:00

users

Merged more conflicts

2012-09-15 17:44:30 -07:00