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
..
getting_started	fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png	2011-06-09 15:12:35 -07:00
edit.html.haml	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
getting_started.html.haml	Revert "refactored local person person friend finder functionality to use the partial"	2011-02-08 16:40:33 -08:00