Tom Hughes 0ea9f92be5 Merge branch 'master' into openid ... Conflicts: app/controllers/user_controller.rb		2010-12-05 15:15:55 +00:00
..
fixtures	Merge branch 'master' into openid	2010-10-17 10:59:29 +01:00
functional	Fix test for change to editor options	2010-12-01 09:27:12 +00:00
integration	Fixup openid test to reflect changes merged from master	2010-10-05 00:45:03 +01:00
unit	Initial work on support for multiple editors	2010-11-29 12:20:21 +00:00
test_helper.rb	Add monkey patch to make openid tests work with rails 2	2010-10-01 21:07:35 +01:00