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)
commita0dc300840c236d6460c0641f8a9f47246815ad1
treec2a14bee0acfb0f2104c1c74f538a577c85e526a
parent84e19eba834238e99d598cfeb70e2e1c7e421bc3
parent19c26e70a357f4e191c8d7bb8c2cc57575792cc0
Merge remote-tracking branch 'upstream/pull/1972'
config/routes.rb