Tom Hughes 4d91fe3dd9 Merge branch 'master' into openstreetbugs ... Conflicts: Gemfile app/helpers/application_helper.rb app/views/site/index.html.erb		2012-09-20 16:01:24 +01:00
..
fixtures	Merge branch 'master' into openstreetbugs	2012-08-22 20:52:08 +01:00
functional	Merge branch 'master' into openstreetbugs	2012-09-20 16:01:24 +01:00
integration	Fix test failure caused by moving OAuth settings link	2012-08-10 08:27:28 +01:00
performance	Update to rails 3	2011-11-14 09:42:40 +00:00
unit	Don't allow hash signs in usernames	2012-07-23 12:59:50 +01:00
test_helper.rb	Get all the tests passing under ruby 1.9	2012-05-27 13:51:25 +01:00