Raphael Sofaer 9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change ... Conflicts: app/controllers/users_controller.rb config/locales/diaspora/en.yml db/schema.rb spec/controllers/users_controller_spec.rb spec/mailers/notifier_spec.rb		2011-07-19 10:44:00 -07:00
..
_notifier_css.haml	Revert "deleted unused file". sorry!! :(	2011-07-15 22:33:55 -07:00
also_commented.html.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
also_commented.text.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
comment_on_post.html.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
comment_on_post.text.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
confirm_email.html.haml	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
confirm_email.text.haml	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
liked.html.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
liked.text.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
mentioned.html.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
mentioned.text.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
private_message.html.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
private_message.text.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
single_admin.html.haml	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
single_admin.text.haml	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
started_sharing.html.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00
started_sharing.text.haml	fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews	2011-07-15 21:22:29 -07:00