From: Tom Hughes <tom@compton.nu>
Date: Sun, 10 Nov 2019 09:50:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2429'
X-Git-Tag: live~2967
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/551e4295c0c994fd28973a4b02f56befbd25aaa9?hp=551e4295c0c994fd28973a4b02f56befbd25aaa9

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