From: Andy Allan <git@gravitystorm.co.uk>
Date: Sun, 21 Jan 2018 11:20:19 +0000 (+0000)
Subject: Merge branch 'master' into moderation
X-Git-Tag: live~4039^2~60
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ae4487921350e141efed42fdf7cd3fd70d72bc97?hp=ae4487921350e141efed42fdf7cd3fd70d72bc97

Merge branch 'master' into moderation
---