Merge remote-tracking branch 'upstream/pull/1801'
authorTom Hughes <tom@compton.nu>
Mon, 2 Apr 2018 14:25:17 +0000 (15:25 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 2 Apr 2018 14:25:17 +0000 (15:25 +0100)
commit10c3230e2716d5791e1007e5762988fec57e0a4d
treee47d3d2eb997d3bfc1a13586a835b2200b092965
parent7e6e1dfbaf2d9112aa0c86a2546fa1780dd69023
parent6f74ae342974a4190517bcccec692d7bed6cb2c8
Merge remote-tracking branch 'upstream/pull/1801'
config/locales/en.yml