Merge remote-tracking branch 'upstream/pull/1836'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:37:55 +0000 (17:37 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:37:55 +0000 (17:37 +0100)
commit0d7c9a187e23ded9c7500851075868c3c038773b
tree5827a6d8e9f6ea4f715efe912fc5b4ff5c681502
parent7f24a2f1d621a4a3e784fd289604a17086b88d6d
parent2c7bc3649367bb7f1f75e8ed78c50464645b87cc
Merge remote-tracking branch 'upstream/pull/1836'
config/locales/en.yml