]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ba1dc3 06a40fd)
Merge remote-tracking branch 'upstream/pull/4450'
authorTom Hughes <tom@compton.nu>
Mon, 1 Jan 2024 19:10:01 +0000 (19:10 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 1 Jan 2024 19:10:01 +0000 (19:10 +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