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
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 22:18:47 -07:00
helpers	MS figured out how to get comments to come thru the websocket. this is super super super hacky, and kind of terrible, but it works	2010-06-28 17:35:38 -07:00
models	urls are now unique, and a user can not add a friend with the exact same url	2010-06-29 16:04:15 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 17:30:29 -07:00