From: Tom Hughes <tom@compton.nu>
Date: Fri, 27 Nov 2020 08:53:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2985' into master
X-Git-Tag: live~1794
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fccf20edb265fb5a38ee7c0db5ff1abcbbb344dc

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

fccf20edb265fb5a38ee7c0db5ff1abcbbb344dc