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)
commit4abd9cfcf19701bf43322374c5df6dd586449e54
tree9c44a7a5b529af831842a9a8c9cf1383d41fbf28
parent697e36f364506037efb198f454226ca1eb956bed
parentbab39572a17146d5b6e696f0ba584a89daac10c7
Merge remote-tracking branch 'upstream/pull/2994'
config/locales/en.yml