]> source.dussan.org Git - redmine.git/commit
Merged r9417 from trunk (#10664).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 20 Apr 2012 07:45:33 +0000 (07:45 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 20 Apr 2012 07:45:33 +0000 (07:45 +0000)
commite5802895ce0a0aefd156405d5f0ed558f9125bed
tree0b684a08d48ef5df51853753104869be8d56d244
parentda1a3449ced1347529b965822990f22c3fe4acd4
Merged r9417 from trunk (#10664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
14 files changed:
app/controllers/account_controller.rb
app/controllers/application_controller.rb
app/controllers/my_controller.rb
app/models/user.rb
app/views/my/_sidebar.html.erb
app/views/my/destroy.html.erb [new file with mode: 0644]
app/views/settings/_authentication.html.erb
config/locales/en.yml
config/locales/fr.yml
config/routes.rb
config/settings.yml
test/functional/my_controller_test.rb
test/integration/routing/my_test.rb
test/unit/user_test.rb