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
..
_comment.html.haml	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 12:09:35 -07:00
_comments.html.haml	forgot to add partial file to git...sorry	2010-06-26 23:43:30 -07:00
_new_comment.html.haml	forgot to take out a debug line. i kept comments in, but they prevent a new post to be sent from the database to the view. on refresh everything works. also moved comments to its own partial so we can add it to all posts	2010-06-26 15:40:33 -07:00