Merge remote-tracking branch 'upstream/pull/1962'
authorTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:46:44 +0000 (08:46 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:46:44 +0000 (08:46 +0100)
1  2 
config/locales/en.yml

Simple merge