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)
commit9d2f920feb9dce028b985e8d452538d3df7a1d9c
tree1c3a761f07b2f32b2115f88adac3c0cc3568e33a
parent6648d3a2a6202566099423472665d3072eb02ae9
parent7a933cf928cfca83e5448c699fa84d1e209ba0a7
Merge remote-tracking branch 'upstream/pull/1693'
app/assets/javascripts/index/directions.js
app/assets/stylesheets/common.scss
config/locales/en.yml