Tom Hughes 72e33046c8 Merge branch 'master' into openstreetbugs ... Conflicts: app/views/browse/_map.html.erb app/views/site/index.html.erb		2011-08-13 11:48:04 +01:00
..
fixtures	Merge branch 'master' into openstreetbugs	2011-06-22 22:36:43 +01:00
functional	Merge branch 'master' into openstreetbugs	2011-08-13 11:48:04 +01:00
integration	Start ROTS for user login tests as well as creation tests	2011-05-21 13:35:15 +01:00
unit	Initial work on support for multiple editors	2010-11-29 12:20:21 +00:00
test_helper.rb	Start ROTS for user login tests as well as creation tests	2011-05-21 13:35:15 +01:00