]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2934' into master
authorTom Hughes <tom@compton.nu>
Thu, 5 Nov 2020 12:40:46 +0000 (12:40 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 5 Nov 2020 12:40:46 +0000 (12:40 +0000)

Trivial merge