Merge remote-tracking branch 'upstream/pull/1837'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:38:19 +0000 (17:38 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:38:19 +0000 (17:38 +0100)
commitaebfbdcfbdb772914ca55c1b5f957f62c1c9cf24
treed3080e7279c3c563f046b51f5691eddf5e5ca65e
parent0d7c9a187e23ded9c7500851075868c3c038773b
parentdfa2fd7d3d969cb196692dc3e7692153ae6ea5b8
Merge remote-tracking branch 'upstream/pull/1837'
config/locales/en.yml