From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 Aug 2020 17:23:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2766'
X-Git-Tag: live~3367
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b0bedbda471b0c7bbb933668c50a7f1b76770ecf?hp=d82b8d2258f0ae6049db1a07da1a28f3ec4c315a

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