Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p
authorAndy Allan <git@gravitystorm.co.uk>
Wed, 22 Nov 2017 10:47:18 +0000 (10:47 +0000)
committerAndy Allan <git@gravitystorm.co.uk>
Wed, 22 Nov 2017 10:47:18 +0000 (10:47 +0000)
commit15b104f4ff4614aa78c01180b6a9b89dd5a1400f
treee0adb3f093c7f7ef8538995533017159be58e7b6
parent6e612d953a555cabd24b49aa9e7d008c6b077086
parentee6e0d5c0baf90c1464b8f0301cfbafed6685f98
Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

Refs #139
app/controllers/api_controller.rb
app/controllers/relation_controller.rb
app/controllers/search_controller.rb
app/models/relation.rb