]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2970' into master
authorTom Hughes <tom@compton.nu>
Wed, 25 Nov 2020 15:18:39 +0000 (15:18 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 25 Nov 2020 15:18:39 +0000 (15:18 +0000)

Trivial merge