Tom Hughes 78f608b114 Merge branch 'master' into notes ... Conflicts: app/assets/javascripts/browse.js app/assets/javascripts/map.js.erb app/assets/stylesheets/common.css.scss app/views/site/index.html.erb		2012-12-01 18:22:30 +00:00
..
fixtures	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
functional	Merge branch 'master' into notes	2012-12-01 18:22:30 +00:00
integration	Simplify handling of verified emails in OpenID signup	2012-10-30 21:43:38 +00:00
performance	Update to rails 3	2011-11-14 09:42:40 +00:00
unit	Fix bogus test	2012-11-12 19:27:09 +00:00
test_helper.rb	Get all the tests passing under ruby 1.9	2012-05-27 13:51:25 +01:00