MrZYX 93be252b59 Merge branch 'css-rtl' ... Conflicts: public/javascripts/application.js public/javascripts/inbox.js		2011-04-11 21:52:01 +02:00
..
controllers	fixed #1013 thanks jbivins	2011-04-11 17:08:36 +02:00
helpers	Merge branch 'css-rtl'	2011-04-11 21:52:01 +02:00
mailers	add a plaintext layout for emails, and include a link to change your email settings in the emails	2011-03-22 12:26:38 -07:00
models	refetch profile if it's missing, comment out hydra stub for now because it breaks the specs	2011-04-09 15:20:28 +02:00
uploaders	Make urls not change on processing	2011-03-21 18:42:36 -07:00
views	Merge branch 'css-rtl'	2011-04-11 21:52:01 +02:00