Raphael Sofaer 87d0f9d6fd Merge branch 'master' of github.com:diaspora/diaspora		2011-07-28 14:42:02 -07:00
..
controllers	Merge remote branch 'manuels/842-sortable-aspects'	2011-07-28 14:36:41 -07:00
helpers	touched up reshare view	2011-07-28 13:46:16 -07:00
mailers	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
models	Merge remote branch 'manuels/842-sortable-aspects'	2011-07-28 14:36:41 -07:00
uploaders	constrain in the image uploader, don't crop	2011-07-10 17:03:38 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2011-07-28 14:42:02 -07:00