danielvincent cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-16 16:06:28 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
helpers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-16 16:06:28 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	DG IZ; aspect deletion	2010-09-16 16:03:18 -07:00