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
..
_sidebar.html.haml	fixed stream bull	2010-06-29 15:05:09 -07:00
index.html.haml	added will pagination action.	2010-06-28 21:56:58 -07:00
new.html.haml	MS RS fixed real name, now profiles are created with a new friend	2010-06-29 20:33:55 -07:00
show.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 20:56:44 -07:00