]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2e11a3 3e49e4a)
Merge remote-tracking branch 'upstream/pull/2116'
authorTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)
1  2 
app/abilities/ability.rb patch | diff1 | diff2 | blob | history

diff --cc app/abilities/ability.rb
Simple merge
The OpenStreetMap web site