Raphael c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg ... Conflicts: config/locales/diaspora/en.yml		2010-11-04 18:56:43 -07:00
..
controllers	Move prep_image_url into profile image_url setter	2010-11-04 18:46:15 -07:00
helpers	killed albums	2010-11-04 10:17:19 -07:00
mailers	mailer doesn't break everything anymore. attachments are also inlined.	2010-11-02 17:59:50 -07:00
models	Fix 328 profile images dying, thanks to theBernd	2010-11-04 18:46:15 -07:00
uploaders	the photo image url is now randomized	2010-11-04 14:37:08 -07:00
views	Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg	2010-11-04 18:56:43 -07:00