]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f24a2f 2c7bc36)
Merge remote-tracking branch 'upstream/pull/1836'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:37:55 +0000 (17:37 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:37:55 +0000 (17:37 +0100)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

diff --cc config/locales/en.yml
Simple merge
The OpenStreetMap web site