]> git.openstreetmap.org Git - rails.git/commitdiff
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)
1  2 
app/controllers/application_controller.rb
app/models/user.rb
app/views/users/show.html.erb
config/locales/en.yml

Simple merge
Simple merge
Simple merge