maxwell 3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora		2010-11-08 15:56:18 -08:00
..
controllers	collapse person's photos and status message into their profile; also, made these nested on a person	2010-11-08 15:55:58 -08:00
helpers	aspect labels on people#show view	2010-11-06 11:09:11 -07:00
mailers	mailer queue now works	2010-11-05 11:58:25 -07:00
models	user#friends is now a many-foreign_key assoc, rather than a many-in	2010-11-08 15:19:23 -08:00
uploaders	the photo image url is now randomized	2010-11-04 14:37:08 -07:00
views	collapse person's photos and status message into their profile; also, made these nested on a person	2010-11-08 15:55:58 -08:00