Merge remote-tracking branch 'upstream/pull/1964'
authorTom Hughes <tom@compton.nu>
Thu, 30 Aug 2018 17:26:05 +0000 (18:26 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 30 Aug 2018 17:26:05 +0000 (18:26 +0100)
1  2 
config/locales/en.yml
config/routes.rb

Simple merge
Simple merge