danielvincent af91eb51b4 Merge branch 'master' of github.com:diaspora/diaspora		2010-09-23 10:49:41 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-23 10:49:41 -07:00
helpers	fix in person partial	2010-09-23 10:49:35 -07:00
models	Delete user.terse_url	2010-09-23 10:24:10 -07:00
uploaders	Spell our own name right	2010-09-15 17:56:18 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-23 10:49:41 -07:00