From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Jul 2021 19:17:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3278'
X-Git-Tag: live~2524
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/af637e0d92c200fcd18a370d1e460a05e9ee1a4a?hp=dd9eca9346d7ace897b82fb940421b56b01f8135

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