Raphael Sofaer ddd4424df8 Merge remote branch 'manuels/842-sortable-aspects' ... Conflicts: app/models/user.rb db/schema.rb		2011-07-28 14:36:41 -07:00
..
controllers	Merge remote branch 'manuels/842-sortable-aspects'	2011-07-28 14:36:41 -07:00
helpers	let the direction_for helper return ltr instead of nothing for ltr text, this should fix #1668	2011-07-27 22:34:41 +02: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 remote branch 'manuels/842-sortable-aspects'	2011-07-28 14:36:41 -07:00