]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/5403'
authorTom Hughes <tom@compton.nu>
Mon, 10 Feb 2025 18:54:14 +0000 (18:54 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 10 Feb 2025 18:54:14 +0000 (18:54 +0000)
1  2 
app/controllers/application_controller.rb
app/controllers/site_controller.rb
config/locales/en.yml
config/settings.yml

Simple merge
Simple merge
Simple merge