]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2914' into master
authorTom Hughes <tom@compton.nu>
Tue, 27 Oct 2020 22:44:07 +0000 (22:44 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 27 Oct 2020 22:44:07 +0000 (22:44 +0000)

Trivial merge