danielvincent a1830b5d40 Merge branch 'master' of github.com:diaspora/diaspora		2010-10-20 18:15:19 -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	changing photo now updates all user images in page	2010-10-20 12:35:16 -07:00
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	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-20 18:15:19 -07:00