maxwell daf0de2eb0 Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus		2010-07-22 11:54:07 -07:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus	2010-07-22 11:54:07 -07:00
helpers	i think it works - max	2010-07-21 21:15:16 -07:00
models	Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus	2010-07-22 11:54:07 -07:00
uploaders	Tests all pass!	2010-07-22 11:36:36 -07:00
views	MS DG request bar fix, and some other small tweaks	2010-07-21 16:38:33 -07:00