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

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