danielvincent 0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-06-29 17:30:29 -07:00
..
blogs	DG IZ; getting there.	2010-06-29 14:34:33 -07:00
bookmarks	DG IZ; getting there.	2010-06-29 14:34:33 -07:00
comments	DG IZ; cool labels fade in	2010-06-29 17:27:09 -07:00
dashboard	DG IZ; getting there.	2010-06-29 14:34:33 -07:00
devise	login page	2010-06-28 22:18:05 -07:00
friends	fixed stream bull	2010-06-29 15:05:09 -07:00
layouts	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 17:30:29 -07:00
posts	added debug partial	2010-06-25 15:35:40 -07:00
shared	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 17:30:29 -07:00
status_messages	DG IZ; getting there.	2010-06-29 14:34:33 -07:00
users	DG MS; clicking on a person's name redirects to that person's post stream	2010-06-23 14:32:51 -07:00