]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/4410'
authorTom Hughes <tom@compton.nu>
Fri, 15 Dec 2023 17:35:15 +0000 (17:35 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 15 Dec 2023 17:35:15 +0000 (17:35 +0000)
1  2 
config/key.yml
config/locales/en.yml

diff --cc config/key.yml
Simple merge
Simple merge