From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 Nov 2020 08:14:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2966' into master
X-Git-Tag: live~1933
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/835a1f9fcb8f5e54db98a12a2db7759a7ec0c755?hp=-c

Merge remote-tracking branch 'upstream/pull/2966' into master
---

835a1f9fcb8f5e54db98a12a2db7759a7ec0c755