]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/3419'
authorTom Hughes <tom@compton.nu>
Thu, 3 Feb 2022 18:37:12 +0000 (18:37 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 3 Feb 2022 18:37:12 +0000 (18:37 +0000)
1  2 
config/locales/en.yml
test/controllers/users_controller_test.rb

Simple merge