From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Jul 2020 07:28:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2683'
X-Git-Tag: live~2142
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/02184fae74fa4d1362de400cee5bd4f2d4a356e3

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

02184fae74fa4d1362de400cee5bd4f2d4a356e3