From: Tom Hughes <tom@compton.nu>
Date: Wed, 23 Dec 2020 15:02:04 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3015'
X-Git-Tag: live~2859
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1eb1335bb2b8f8a545c6a267d7cca81508197db8?hp=4f304e23018e9a1380e2374b9a8d419275d99c76

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