From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Jun 2020 09:32:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2679'
X-Git-Tag: live~2241
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/efaddc5070c175e9f6acfe8cb9ed0bb15e89bf84?ds=sidebyside;hp=efaddc5070c175e9f6acfe8cb9ed0bb15e89bf84

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