danielvincent 88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-01 17:22:30 -07:00
..
controllers	to warzombie, user must have email tom@joindiaspora.com, and there musn't be a bomb in the lasanga	2010-07-01 10:55:22 -07:00
helpers	fixed user image bug	2010-07-01 16:35:44 -07:00
models	RS MS comments propagate, and show up IN REAL TIME	2010-06-30 17:29:32 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-01 17:22:30 -07:00