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
..
images	Replace searching.gif with loader from iD	2013-11-15 16:11:44 -08:00
javascripts	Merge branch 'master' into redesign	2013-11-15 16:47:49 -08:00
opensearch	Serve OpenSearch definition though the assets pipeline	2011-12-30 22:37:11 +00:00
stylesheets	Replace searching.gif with loader from iD	2013-11-15 16:11:44 -08:00