From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 07:46:25 +0000 (+0800)
Subject: Merge branch 'master' into moderation
X-Git-Tag: live~2989^2~45
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493?hp=424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493

Merge branch 'master' into moderation
---