Merge remote-tracking branch 'upstream/pull/1799'
authorTom Hughes <tom@compton.nu>
Wed, 28 Mar 2018 16:38:34 +0000 (17:38 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Mar 2018 16:38:34 +0000 (17:38 +0100)
commit357de642b32520cc6a899384b1f8ad078dc479b1
treefd5cb133912bf3690777219e292eed26fd799db6
parentf3b6e0faa1cbf92b46555bea2fca62ca1895e703
parent3b75e9241507c0672dabaec44ecb83148df979b6
Merge remote-tracking branch 'upstream/pull/1799'
config/locales/en.yml