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
..
_analytics.html.erb	Made the analytics code a partial rather than a helper function.	2010-12-15 05:46:36 -05:00
_banner.html.haml	First commit.	2011-10-10 15:39:52 +01:00
_flash_messages.html.haml	Fixed up Change Password screens. Restyles flash messages and added the	2011-10-10 18:10:24 +01:00