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
..
environments	Merge ../template into 3.1_upgrade	2011-10-30 12:15:13 +00:00
initializers	Merge ../template into 3.1_upgrade	2011-10-30 12:15:13 +00:00
locales	Moved project over to rails 3.1.1. Removed Typus and now need to add new	2011-10-30 11:40:57 +00:00
typus	Removed localised paperclip plugin and added the gem. Added :preview	2010-12-20 12:11:07 -05:00
.routes.rb.un~	Initial commit.	2010-10-07 11:02:13 -04:00
amazon_s3.yml	Initial commit.	2010-10-07 11:02:13 -04:00
application.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
boot.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
config.yml	Merge ../template into 3.1_upgrade	2011-10-30 12:15:13 +00:00
environment.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
rackspace_cloudfiles.yml	Initial commit.	2010-10-07 11:02:13 -04:00
routes.rb	Merge ../template into 3.1_upgrade	2011-10-30 12:15:13 +00:00