From: Tom Hughes <tom@compton.nu>
Date: Sun, 27 Jun 2021 17:44:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3235'
X-Git-Tag: live~2090
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/90360df6d76627d29eeaee7f1d1c2819e5d206b2?hp=90360df6d76627d29eeaee7f1d1c2819e5d206b2

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