Merge remote-tracking branch 'upstream/pull/1985'
authorTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 17:58:27 +0000 (18:58 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 17:58:27 +0000 (18:58 +0100)
commit0e0c89b95c16abd7bc548bea7bff03cbb715b3b3
treef31ef8b317e7aa8f93221e616a5e45391938a6c1
parent995a5f89c2cbcac2f570c60ffa257f7655756e97
parent3f2ba044e54c3529c3afc531ab1c18b16c432be8
Merge remote-tracking branch 'upstream/pull/1985'
config/locales/en.yml
config/routes.rb