Raphael d7828a8bf3 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: spec/controllers/publics_controller_spec.rb		2010-08-11 13:59:21 -07:00
..
controllers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-11 13:59:21 -07:00
fixtures	RS, IZ; extracted and murdered ostatus.	2010-08-04 16:00:01 -07:00
helpers	MS IZ request specs now PASS	2010-08-10 17:36:25 -07:00
lib	build_xml_for is no longer static, we should probably change the name	2010-08-11 13:58:18 -07:00
models	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-11 12:29:35 -07:00
factories.rb	User factory now works	2010-08-06 13:27:42 -07:00
misc_spec.rb	User factory now works	2010-08-06 13:27:42 -07:00
spec_helper.rb	Refactored message_queue getting, fixed retraction spec	2010-08-06 13:13:00 -07:00
user_encryption_spec.rb	build_xml_for is no longer static, we should probably change the name	2010-08-11 13:58:18 -07:00