Merge remote-tracking branch 'upstream/pull/1972'
authorTom Hughes <tom@compton.nu>
Wed, 5 Sep 2018 17:41:17 +0000 (18:41 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 5 Sep 2018 17:41:17 +0000 (18:41 +0100)
1  2 
config/routes.rb

Simple merge