From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Nov 2020 10:49:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2921' into master
X-Git-Tag: live~2885
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4347d9d3b00a8fffe78daa93eac5b490905f9ac8?hp=4347d9d3b00a8fffe78daa93eac5b490905f9ac8

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