]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2989' into master
authorTom Hughes <tom@compton.nu>
Tue, 1 Dec 2020 22:26:02 +0000 (22:26 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 1 Dec 2020 22:26:02 +0000 (22:26 +0000)

Trivial merge