Merge remote-tracking branch 'upstream/pull/1693'

author Tom Hughes <tom@compton.nu>

Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)

committer Tom Hughes <tom@compton.nu>

Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
author Tom Hughes <tom@compton.nu>
Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
committer Tom Hughes <tom@compton.nu>
Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
diff --cc app/assets/javascripts/index/directions.js
Simple merge
diff --cc app/assets/stylesheets/common.scss
Simple merge
diff --cc config/locales/en.yml
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
committer	Tom Hughes <tom@compton.nu>
	Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)
		1	2
app/assets/javascripts/index/directions.js	patch \|	diff1 \|	diff2 \|	blob \| history
app/assets/stylesheets/common.scss	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	patch \|	diff1 \|	diff2 \|	blob \| history