From: Tom Hughes <tom@compton.nu>
Date: Tue, 10 Nov 2020 09:39:49 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2950' into master
X-Git-Tag: live~1890
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e99692fae85066fbfcc1bae99ebb29974104e3bc

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

e99692fae85066fbfcc1bae99ebb29974104e3bc