danielvincent 183ac75c6a Merge branch 'master' of github.com:diaspora/diaspora		2010-10-20 17:35:35 -07:00
..
controllers	remove friend from aspect box, with js call to remove the person from the aspect	2010-10-20 17:34:52 -07:00
helpers
models	remove friend from aspect box, with js call to remove the person from the aspect	2010-10-20 17:34:52 -07:00
uploaders
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 17:35:35 -07:00