From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Mar 2021 14:15:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3157'
X-Git-Tag: live~1753
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bdfd93579342135a097cd90d906bc15adb3b666c?hp=12228510c3d543493d8907731281871c8785c40e

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