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

Trivial merge