Tom Hughes 52e5fa6ad7 Merge branch 'master' into openstreetbugs ... Conflicts: app/views/browse/_map.html.erb app/views/site/index.html.erb config/initializers/mime_types.rb config/routes.rb lib/map_boundary.rb lib/migrate.rb lib/osm.rb vendor/assets/openlayers/OpenLayers.js		2012-01-05 20:15:53 +00:00
..
fixtures	Merge branch 'master' into openstreetbugs	2012-01-05 20:15:53 +00:00
functional	Merge branch 'master' into openstreetbugs	2012-01-05 20:15:53 +00:00
integration	Add extra login tests for case insensitive usernames	2011-12-13 21:49:25 +00:00
performance	Update to rails 3	2011-11-14 09:42:40 +00:00
unit	Replace @ with ~ in the shortlink	2011-11-24 22:27:16 +00:00
test_helper.rb	Remove monkey patch added for rails 2	2011-11-14 09:42:50 +00:00