danielvincent 01f048b0a6 Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: public/stylesheets/sass/application.sass		2010-06-28 22:18:47 -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	added will pagination action.	2010-06-28 21:56:58 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-28 22:18:47 -07:00