zhitomirskiyi 27f1231479 Merge branch 'master' of github.com:diaspora/diaspora		2011-02-01 12:11:49 -08:00
..
controllers	Merge branch 'master' of github.com:diaspora/diaspora	2011-02-01 12:11:49 -08:00
helpers	Move image_url defaulting logic into profile	2011-02-01 11:56:56 -08:00
mailers	Fix build	2011-01-28 12:18:56 -08:00
models	Merge branch 'master' of github.com:diaspora/diaspora	2011-02-01 12:11:49 -08:00
uploaders	remove s3 setting	2011-01-17 16:46:39 -08:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2011-02-01 12:11:49 -08:00