Merge 16743:16811 from trunk.
authorTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:50:47 +0000 (23:50 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 3 Aug 2009 23:50:47 +0000 (23:50 +0000)
commitcbbfdf394880d29c9a6cc2259fcfd474088fa9bb
tree9f743b61eda29fdb9ab73032c022c98613a67232
parent655dc6787e9092a004b582b52ff8e9ccd0d40bb3
parent254ce1eca0052a004a24065d247e55b8fe5b7675
Merge 16743:16811 from trunk.
12 files changed:
app/controllers/user_controller.rb
app/models/notifier.rb
app/models/user.rb
app/views/notifier/reset_password.text.html.erb
app/views/notifier/reset_password.text.plain.erb
app/views/user/reset_password.html.erb
config/locales/de.yml
config/locales/en.yml
db/migrate/038_add_message_sender_index.rb
db/migrate/039_create_oauth_tables.rb
db/migrate/040_add_fine_o_auth_permissions.rb
db/migrate/041_add_foreign_keys_to_oauth_tables.rb