danielvincent 762cbcb0f2 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/comments/_comment.html.haml app/views/layouts/application.html.haml		2010-06-28 12:09:35 -07:00
..
blogs	RS, IZ; Added ids to views	2010-06-28 14:46:43 -04:00
bookmarks	RS, IZ; Added ids to views	2010-06-28 14:46:43 -04:00
comments	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 12:09:35 -07:00
dashboard	Change the form_for not to need a message passed, and adding it to the home page	2010-06-25 19:58:40 -07:00
devise	took out filler elements	2010-06-20 11:49:05 -07:00
friends	MS^2 Added the friends panel to application layout	2010-06-25 19:22:05 -07:00
layouts	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 12:09:35 -07:00
posts	added debug partial	2010-06-25 15:35:40 -07:00
status_messages	RS, IZ; Added ids to views	2010-06-28 14:46:43 -04: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