Tom Hughes 3d7eb387a7 Merge branch 'master' into notes ... Conflicts: Gemfile.lock app/assets/stylesheets/common.css.scss app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml		2013-01-15 21:11:35 +00:00
..
images	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
javascripts	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00
opensearch	Serve OpenSearch definition though the assets pipeline	2011-12-30 22:37:11 +00:00
stylesheets	Merge branch 'master' into notes	2013-01-15 21:11:35 +00:00