Merge remote-tracking branch 'openstreetmap/pull/1437'
authorTom Hughes <tom@compton.nu>
Sun, 5 Mar 2017 10:34:23 +0000 (10:34 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 5 Mar 2017 10:34:23 +0000 (10:34 +0000)
1  2 
app/assets/javascripts/index/directions/graphhopper.js
config/locales/en.yml

Simple merge