Merge remote-tracking branch 'upstream/pull/1838'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:38:35 +0000 (17:38 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:38:35 +0000 (17:38 +0100)
1  2 
config/locales/en.yml

Simple merge