]> git.openstreetmap.org Git - rails.git/commit
Merge remote-tracking branch 'upstream/pull/3257'
authorTom Hughes <tom@compton.nu>
Wed, 21 Jul 2021 18:24:31 +0000 (19:24 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 21 Jul 2021 18:24:31 +0000 (19:24 +0100)
commitf1935b1c5786de8f27bee9b6b2da2f28f650468f
tree9acc797766c414db6edb1b46aa67d6a87db463e2
parent0bbdadd727a37ee71d4a8c89b50ce2060d6a6240
parent44199f23e1520623555eac2de6a2e97e3ed0e4ad
Merge remote-tracking branch 'upstream/pull/3257'
app/controllers/application_controller.rb
app/models/user.rb
app/views/users/show.html.erb
config/locales/en.yml