Merge remote-tracking branch 'upstream/pull/1962'
authorTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:46:44 +0000 (08:46 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:46:44 +0000 (08:46 +0100)
commit05514ced0c121c1e936bec0e301faa4a04cc3a30
tree5c203281df463d295cbecd5925839c5f953df02e
parent43776279fb7bb1103a52ee72af2b3497a1274995
parentf38e03f0ed01d7624a6a8ae79234ad1ac3918f2b
Merge remote-tracking branch 'upstream/pull/1962'
config/locales/en.yml