]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34a918c 09ba878)
Merge remote-tracking branch 'upstream/pull/1595'
authorTom Hughes <tom@compton.nu>
Thu, 27 Jul 2017 18:18:31 +0000 (19:18 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Jul 2017 18:18:31 +0000 (19:18 +0100)
1  2 
app/controllers/user_controller.rb patch | diff1 | diff2 | blob | history

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