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
..
cldr	added arabic	2011-05-08 01:02:33 +02:00
devise	Removed unneeded character (probably problematic) after a string.	2011-07-14 12:59:15 +02:00
diaspora	Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change	2011-07-19 10:44:00 -07:00
inflections	added readme for inflection definitions	2011-04-18 22:37:24 +02:00
javascript	Merge pull request #1583 from Gallaecio/master	2011-07-15 15:28:42 -07:00