John Firebaugh 2b4f8e92c9 Merge branch 'master' into redesign ... Conflicts: app/controllers/browse_controller.rb app/views/layouts/_head.html.erb config/environments/production.rb config/routes.rb		2013-11-15 16:47:49 -08:00
..
fixtures	Test user#reset_password	2013-10-15 21:27:25 +01:00
functional	Merge branch 'master' into redesign	2013-11-15 16:47:49 -08:00
integration	Make sure the "terms seen" tests actually run	2013-09-29 15:43:16 +01:00
performance	Update to rails 3	2011-11-14 09:42:40 +00:00
traces	Add tests for trace#data	2013-10-16 00:46:20 +01:00
unit	Add more tests for hidden diary entries and comments	2013-10-15 19:21:39 +01:00
test_helper.rb	Add a basic test for browse#note	2013-10-01 19:34:36 +01:00