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
..
friending.rb	Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor	2010-10-26 14:57:52 -07:00
querying.rb	Initial refactor done, need to stop mapping user.friends to people so much	2010-10-22 18:11:04 -07:00
receiving.rb	Moving friendships into a 'Contact' proxy object.	2010-10-22 18:11:04 -07:00