Merge remote-tracking branch 'upstream/pull/1693'
authorTom Hughes <tom@compton.nu>
Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
1  2 
app/assets/javascripts/index/directions.js
app/assets/stylesheets/common.scss
config/locales/en.yml

Simple merge
Simple merge