Tom Hughes a1cb0f04d4 Merge branch 'master' into openstreetbugs ... Conflicts: app/views/site/index.html.erb		2010-10-17 11:02:11 +01:00
..
fixtures	Merge branch 'master' into openstreetbugs	2010-10-17 11:02:11 +01:00
functional	Merge branch 'master' into openstreetbugs	2010-10-17 11:02:11 +01:00
integration	Allow users to send themselves a new confirmation email	2010-10-04 21:52:58 +01:00
unit	There are five trace fixtures now	2010-10-11 23:35:44 +01:00
test_helper.rb	Revert r16046.	2009-06-23 02:48:38 +00:00