From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Dec 2019 10:42:04 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2480'
X-Git-Tag: live~3404
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f0467745bfa9a8c3309ab1b187a3a575d0f20d01?hp=81c244e273690c89eb820709f76d26b67bdc62bb

Merge remote-tracking branch 'upstream/pull/2480'
---