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.rb	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00