danielvincent 67123c664a Merge branch 'master' of github.com:diaspora/diaspora_rails ... Conflicts: app/views/layouts/application.html.haml		2010-06-29 14:36:46 -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	person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field	2010-06-29 12:33:00 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-06-29 14:36:46 -07:00