Dan Barber 08170ec5e0 Merge ../template into 3.1_upgrade ... Conflicts: .gitignore .rvmrc Gemfile Gemfile.lock README Rakefile app/assets/javascripts/application.js app/assets/stylesheets/application.css app/controllers/admin/admin_users_controller.rb app/controllers/application_controller.rb app/models/admin_user.rb config.ru config/application.rb config/config.yml config/database.yml config/environment.rb config/environments/development.rb config/environments/production.rb config/environments/test.rb config/initializers/secret_token.rb config/initializers/session_store.rb config/routes.rb db/schema.rb db/seeds.rb		2011-10-30 12:15:13 +00:00
..
backtrace_silencers.rb	First commit.	2011-10-10 15:39:52 +01:00
devise.rb	First commit.	2011-10-10 15:39:52 +01:00
inflections.rb	First commit.	2011-10-10 15:39:52 +01:00
load_config.rb	Tweaked footer, added config.	2011-10-30 11:51:27 +00:00
mime_types.rb	First commit.	2011-10-10 15:39:52 +01:00
paperclip.rb	Added S3 storage for photos.	2011-10-28 12:33:56 +01:00
secret_token.rb	Moved project over to rails 3.1.1. Removed Typus and now need to add new	2011-10-30 11:40:57 +00:00
session_store.rb	Moved project over to rails 3.1.1. Removed Typus and now need to add new	2011-10-30 11:40:57 +00:00
wrap_parameters.rb	Moved project over to rails 3.1.1. Removed Typus and now need to add new	2011-10-30 11:40:57 +00:00