]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/3293'
authorTom Hughes <tom@compton.nu>
Thu, 12 Aug 2021 17:10:54 +0000 (18:10 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 12 Aug 2021 17:10:54 +0000 (18:10 +0100)
1  2 
app/views/users/show.html.erb

Simple merge