John Firebaugh 2b4f8e92c9 Merge branch 'master' into redesign ... Conflicts: app/controllers/browse_controller.rb app/views/layouts/_head.html.erb config/environments/production.rb config/routes.rb		2013-11-15 16:47:49 -08:00
..
development.rb	Update to rails 4.0.0	2013-09-21 11:35:45 +01:00
production.rb	Merge branch 'master' into redesign	2013-11-15 16:47:49 -08:00
test.rb	Update to rails 4.0.0	2013-09-21 11:35:45 +01:00