Will Bradley 0bc5858101 Merged more conflicts

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

..

environments

Merged more conflicts

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

initializers

Reinstalled devise to user model and migration

2012-09-02 04:12:26 -07:00

locales

Installed Devise and created a home controller/route

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

application.rb

Surprise Rails app!

2012-08-30 23:54:25 -07:00

boot.rb

Surprise Rails app!

2012-08-30 23:54:25 -07:00

database.yml

Surprise Rails app!

2012-08-30 23:54:25 -07:00

environment.rb

Surprise Rails app!

2012-08-30 23:54:25 -07:00

routes.rb

Merged more conflicts

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