From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jul 2020 18:09:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2696'
X-Git-Tag: live~2057
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/efa2c20bff4d68cfdaf5fc532ba5eb0711e7cd2d

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

efa2c20bff4d68cfdaf5fc532ba5eb0711e7cd2d