Tom Hughes e660e60966 Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile Gemfile.lock lib/migrate.rb		2012-03-08 18:23:27 +00:00
..
map.js.erb	Rename "Mapnik" to "Standard" in the layer switcher	2012-03-01 12:18:55 +00:00
menu.js	Fixes and cleanups suggested by JSHint	2012-02-01 00:25:10 +00:00
notes.js	Move notes resources to assets directory	2012-01-07 16:36:58 +00:00
openlayers.js.erb	Allow OpenStreetMap.js to work with an unpatched OpenLayers	2011-12-31 00:25:04 +00:00
pngfix.js	Upgrade to rails 3.1.0	2011-11-14 09:42:52 +00:00
site.js	Make sure we don't attach alert handler multiple times	2012-02-21 19:22:01 +00:00