Merge remote-tracking branch 'upstream/pull/1838'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:38:35 +0000 (17:38 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:38:35 +0000 (17:38 +0100)
commit00425c8fcad370a7f596dafe8e188837fcb35130
tree07324286c7a214d670d4df9b33fef47109a4de58
parentaebfbdcfbdb772914ca55c1b5f957f62c1c9cf24
parent8445561fccd13404568910fdde56ddf4d7b19a18
Merge remote-tracking branch 'upstream/pull/1838'
config/locales/en.yml