Merge remote-tracking branch 'openstreetmap/pull/1467'
authorTom Hughes <tom@compton.nu>
Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)
commit428e7d6baa28ecb7d06f1f851fdd69ef00249bfb
treecb44196d3b80da351e5708189d326ca7b18ad24b
parent40a8e5caf5e5c69d175a90b81528d81d1e4e0964
parent12013f60a01b10656e1ddfc0937be48157108916
Merge remote-tracking branch 'openstreetmap/pull/1467'
app/controllers/application_controller.rb