ilya a52adba95b Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-23 11:59:31 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails	2010-07-23 11:59:31 -07:00
helpers	MS sort the updates on a author's page	2010-07-22 23:36:37 -07:00
models	DG MS added views for ostatus following	2010-07-22 21:27:43 -07:00
uploaders	Tests all pass!	2010-07-22 11:36:36 -07:00
views	MS typo	2010-07-22 22:34:30 -07:00