]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/4169'
authorTom Hughes <tom@compton.nu>
Sun, 20 Aug 2023 10:04:28 +0000 (11:04 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 20 Aug 2023 10:04:28 +0000 (11:04 +0100)
1  2 
Gemfile.lock
config/locales/en.yml
config/settings.yml

diff --cc Gemfile.lock
Simple merge
Simple merge
Simple merge