danielvincent e159b8f7f4 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/friends/show.html.haml		2010-06-29 20:56:44 -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	MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works	2010-06-28 17:35:38 -07:00
models	MS RS fixed real name, now profiles are created with a new friend	2010-06-29 20:33:55 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 20:56:44 -07:00