From: Tom Hughes <tom@compton.nu>
Date: Mon, 25 Jan 2021 07:06:59 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3069'
X-Git-Tag: live~3318
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/acc6aa08b044296ec7656cc8181dbfef6adc5bf5?hp=-c

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

acc6aa08b044296ec7656cc8181dbfef6adc5bf5