]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bde5fb4 be11f20)
Merge branch 'pull/5261'
authorAnton Khorev <tony29@yandex.ru>
Fri, 17 Jan 2025 01:01:22 +0000 (04:01 +0300)
committerAnton Khorev <tony29@yandex.ru>
Fri, 17 Jan 2025 01:01:22 +0000 (04:01 +0300)
1  2 
app/abilities/ability.rb patch | diff1 | diff2 | blob | history
config/locales/en.yml patch | diff1 | diff2 | blob | history
config/routes.rb patch | diff1 | diff2 | blob | history

diff --cc app/abilities/ability.rb
Simple merge
diff --cc config/locales/en.yml
Simple merge
diff --cc config/routes.rb
Simple merge
The OpenStreetMap web site