Will Bradley f3443a3a82 Fixed merge conflict with mailer url, need to remove this from git as well

2012-09-15 21:44:06 -07:00

..

environments

Fixed merge conflict with mailer url, need to remove this from git as well

2012-09-15 21:44:06 -07:00

initializers

Had to modify door log model and add config.yml to avoid storing password in git

2012-09-15 20:41:17 -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

config.yml.example

Created readme and made config.yml.example match Open_Access_Control_Ethernet

2012-09-15 20:50:03 -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