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

Simple merge
Simple merge