danielvincent 85cee4064b Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: public/javascripts/publisher.js		2010-07-03 22:45:56 -07:00
..
controllers	DG MS; fixed delete button bug on stream	2010-07-01 19:49:56 -07:00
helpers	fixed user image bug	2010-07-01 16:35:44 -07:00
models	DG IZ RS; deletion now gets sent through the websocket	2010-07-02 15:16:28 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-03 22:45:56 -07:00