maxwell e14e391a22 Merge branch 'master' of github.com:diaspora/diaspora_rails		2010-07-28 16:50:48 -07:00
..
controllers	Fixed the tests;	2010-07-28 16:50:38 -07:00
helpers	DG IZ; brushed up ostatus user page	2010-07-28 12:13:36 -07:00
models	Fixed the tests;	2010-07-28 16:50:38 -07:00
uploaders	now should be saving to the directory without the wrong id in the name	2010-07-23 15:49:08 -07:00
views	DG IZ; tweaks to album index page	2010-07-28 16:12:49 -07:00