]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88cf87c a863be8)
Merge remote-tracking branch 'upstream/pull/3403'
authorTom Hughes <tom@compton.nu>
Wed, 22 Dec 2021 15:26:23 +0000 (15:26 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 22 Dec 2021 15:26:23 +0000 (15:26 +0000)
1  2 
app/models/user.rb patch | diff1 | diff2 | blob | history

diff --cc app/models/user.rb
Simple merge
The OpenStreetMap web site