From: Tom Hughes <tom@compton.nu>
Date: Tue, 30 Jun 2020 18:06:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2680'
X-Git-Tag: live~2163
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a8011d8eb97b7586c3592e2e1e5e6792c914d082?hp=a8011d8eb97b7586c3592e2e1e5e6792c914d082

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