]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2957' into master
authorTom Hughes <tom@compton.nu>
Fri, 13 Nov 2020 09:49:10 +0000 (09:49 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 13 Nov 2020 09:49:10 +0000 (09:49 +0000)

Trivial merge