Tom Hughes 0d3a9ed9cb Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile.lock app/views/browse/_map.html.erb app/views/user/view.html.erb config/locales/en.yml config/openlayers.cfg db/structure.sql vendor/assets/openlayers/OpenLayers.js		2012-08-22 20:52:08 +01:00
..
map.js.erb	Replace standard PanZoomBar control with new SimplePanZoom control	2012-08-08 18:20:02 +01:00
menu.js	Stop the menu appearing when the anchor is disabled	2012-04-23 20:59:28 +01:00
notes.js.erb	Start rewriting the notes layer for the front page	2012-08-22 20:37:09 +01:00
openlayers.js.erb	Replace standard PanZoomBar control with new SimplePanZoom control	2012-08-08 18:20:02 +01:00
pngfix.js	Upgrade to rails 3.1.0	2011-11-14 09:42:52 +00:00
site.js	Only reload the preview if the content has changed	2012-03-17 16:36:58 +00:00