]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73214da 5f59845)
Merge remote-tracking branch 'upstream/pull/2161'
authorTom Hughes <tom@compton.nu>
Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)
1  2 
app/controllers/users_controller.rb patch | diff1 | diff2 | blob | history

diff --cc app/controllers/users_controller.rb
Simple merge
The OpenStreetMap web site