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)
1  2 
config/locales/en.yml
config/routes.rb

Simple merge
Simple merge