]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2697'
authorTom Hughes <tom@compton.nu>
Wed, 8 Jul 2020 17:57:32 +0000 (18:57 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 8 Jul 2020 17:57:32 +0000 (18:57 +0100)
1  2 
app/views/users/show.html.erb

Simple merge