Merge remote-tracking branch 'upstream/pull/2642'
authorTom Hughes <tom@compton.nu>
Thu, 4 Jun 2020 16:40:13 +0000 (17:40 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 4 Jun 2020 16:40:13 +0000 (17:40 +0100)
1  2 
config/locales/en.yml

Simple merge