Merge remote-tracking branch 'upstream/pull/2994'
authorTom Hughes <tom@compton.nu>
Wed, 13 Jan 2021 20:40:48 +0000 (20:40 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 13 Jan 2021 20:40:48 +0000 (20:40 +0000)
1  2 
config/locales/en.yml

Simple merge