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
..
assets	Merge branch 'master' into redesign	2013-11-15 16:47:49 -08:00
controllers	Merge branch 'master' into redesign	2013-11-15 16:47:49 -08:00
helpers	Fix lego translations	2013-11-12 14:46:47 -08:00
models	Remove never actually used code from five years ago	2013-10-11 20:03:06 +01:00
views	Merge branch 'master' into redesign	2013-11-15 16:47:49 -08:00