]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2997' into master
authorTom Hughes <tom@compton.nu>
Tue, 8 Dec 2020 15:30:59 +0000 (15:30 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 8 Dec 2020 15:30:59 +0000 (15:30 +0000)

Trivial merge