Merge remote-tracking branch 'upstream/pull/1858'
authorTom Hughes <tom@compton.nu>
Mon, 14 May 2018 19:14:56 +0000 (20:14 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 14 May 2018 19:14:56 +0000 (20:14 +0100)
commitd14cf519fd876274900758a903e7e390d38922d5
treeee58dd7ee3029470a13e97963408659b3fca3e76
parent33ea119c8f520a7e679e38b569c202976907a501
parent00bd64c7fb86d598eb9406e39f99fc711f58bf9b
Merge remote-tracking branch 'upstream/pull/1858'
config/locales/en.yml
config/routes.rb