danielvincent 70ece3c180 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-06-29 20:56:51 -07:00
..
controllers	MS RS fixed real name, now profiles are created with a new friend	2010-06-29 20:33:55 -07:00
helpers	RS MS slightly less explosive end if you call real name on someone that doesn't have a profile	2010-06-29 20:54:53 -07:00
models	RS MS slightly less explosive end if you call real name on someone that doesn't have a profile	2010-06-29 20:54:53 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 20:56:44 -07:00