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

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

0c842480e75ec0ff9f5884ad67fb2f1cb01b1de2