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
..
controllers	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
helpers	putting debug in for master so I can check deployed servers out	2010-06-26 14:16:19 -07:00
models	RS IZ testing GUID	2010-06-28 14:28:01 -04:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 12:09:35 -07:00