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
..
helpers	Merge ../template into 3.1_upgrade	2011-10-30 12:15:13 +00:00
.gitkeep	Moved project over to rails 3.1.1. Removed Typus and now need to add new	2011-10-30 11:40:57 +00:00
admin_user_test.rb	First commit.	2011-10-10 15:39:52 +01:00
category_test.rb	Initial commit.	2010-10-07 11:02:13 -04:00
contact_test.rb	All done! Contact form works, about page now pulls content from database, opening up the possibility of having more pages.	2010-10-12 10:04:13 -04:00
page_test.rb	All done! Contact form works, about page now pulls content from database, opening up the possibility of having more pages.	2010-10-12 10:04:13 -04:00
photo_test.rb	Initial commit.	2010-10-07 11:02:13 -04:00