Will Bradley 0bc5858101 Merged more conflicts		2012-09-15 17:44:30 -07:00
..
application_controller.rb	Surprise Rails app!	2012-08-30 23:54:25 -07:00
door_logs_controller.rb	Merged more conflicts	2012-09-15 17:44:30 -07:00
home_controller.rb	Installed Devise and created a home controller/route	2012-09-02 02:57:34 -07:00
users_controller.rb	Merged more conflicts	2012-09-15 17:44:30 -07:00