From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 22 Nov 2017 10:47:18 +0000 (+0000)
Subject: Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p
X-Git-Tag: live~3777
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f?hp=15b104f4ff4614aa78c01180b6a9b89dd5a1400f

Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

Refs #139
---