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

author Tom Hughes <tom@compton.nu>

Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)

committer Tom Hughes <tom@compton.nu>

Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)
author Tom Hughes <tom@compton.nu>
Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)
committer Tom Hughes <tom@compton.nu>
Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)
diff --cc app/assets/javascripts/index/directions.js
Simple merge
author	Tom Hughes <tom@compton.nu>
	Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)
committer	Tom Hughes <tom@compton.nu>
	Mon, 2 Apr 2018 14:41:35 +0000 (15:41 +0100)