]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5ba77e 78dd142)
Merge remote-tracking branch 'upstream/pull/2993' into master
authorTom Hughes <tom@compton.nu>
Sun, 6 Dec 2020 18:44:33 +0000 (18:44 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 6 Dec 2020 18:44:33 +0000 (18:44 +0000)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

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