Merge remote-tracking branch 'upstream/pull/2431'
authorTom Hughes <tom@compton.nu>
Wed, 15 Apr 2020 18:18:10 +0000 (19:18 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 15 Apr 2020 18:18:10 +0000 (19:18 +0100)
1  2 
config/locales/en.yml

Simple merge