From: Tom Hughes <tom@compton.nu>
Date: Tue, 1 Dec 2020 22:26:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2989' into master
X-Git-Tag: live~1789
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/404f99af1a98e780bb9e3845ef00aa72960d69cc

Merge remote-tracking branch 'upstream/pull/2989' into master
---

404f99af1a98e780bb9e3845ef00aa72960d69cc