Merge remote-tracking branch 'upstream/pull/1963'
authorTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:43:28 +0000 (08:43 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 29 Aug 2018 07:43:28 +0000 (08:43 +0100)
commit43776279fb7bb1103a52ee72af2b3497a1274995
tree5c0d3f25349053655b19f9f1ecccb817eb698889
parent5bc8abbe059ca72187277830e10d89f73858a580
parent71b76a21aea7456a5e5eb4b618fed24a9ff49535
Merge remote-tracking branch 'upstream/pull/1963'
config/locales/en.yml