]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f318c7 7e8af1e)
Merge remote-tracking branch 'upstream/pull/4398'
authorTom Hughes <tom@compton.nu>
Tue, 12 Dec 2023 18:40:33 +0000 (18:40 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 12 Dec 2023 18:40:33 +0000 (18:40 +0000)
1  2 
config/key.yml patch | diff1 | diff2 | blob | history
config/locales/en.yml patch | diff1 | diff2 | blob | history

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