From: Tom Hughes <tom@compton.nu>
Date: Mon, 22 Mar 2021 07:05:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3144'
X-Git-Tag: live~2706
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/240dc47b93fdcc65118e3a54fba6fb167b43059c?hp=9b13520b2e29faa0500a633ee7720c8e154a12a8

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