From: Tom Hughes <tom@compton.nu>
Date: Tue, 19 Jan 2021 20:17:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3061'
X-Git-Tag: live~2308
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/10999cfc5e6f64f1b6d81ddb4a2f751c694bcbc5?hp=10999cfc5e6f64f1b6d81ddb4a2f751c694bcbc5

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