zhitomirskiyi 1024b8a3a7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor ... Conflicts: app/controllers/aspects_controller.rb		2010-10-26 14:57:52 -07:00
..
attack_vectors_spec.rb	should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now	2010-10-22 00:49:01 -07:00
invite_spec.rb	Initial refactor done, need to stop mapping user.friends to people so much	2010-10-22 18:11:04 -07:00
posting_spec.rb	DG MS; fixed some bugs with posting publicly.	2010-10-25 19:24:48 -07:00
receive_spec.rb	Moving friendships into a 'Contact' proxy object.	2010-10-22 18:11:04 -07:00
user_friending_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor	2010-10-26 14:57:52 -07:00
visible_posts_spec.rb	Moving friendships into a 'Contact' proxy object.	2010-10-22 18:11:04 -07:00