Merge remote-tracking branch 'upstream/pull/3124'
authorTom Hughes <tom@compton.nu>
Wed, 17 Mar 2021 18:17:49 +0000 (18:17 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 17 Mar 2021 18:17:49 +0000 (18:17 +0000)
1  2 
config/locales/en.yml

Simple merge