From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Nov 2020 09:39:44 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2948' into master
X-Git-Tag: live~1909
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cacbf42b2900038ab51c9467ab361571aa420423

Merge remote-tracking branch 'upstream/pull/2948' into master
---

cacbf42b2900038ab51c9467ab361571aa420423