Merge remote-tracking branch 'upstream/pull/1809'
authorTom Hughes <tom@compton.nu>
Sun, 29 Apr 2018 18:37:50 +0000 (19:37 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 29 Apr 2018 18:37:50 +0000 (19:37 +0100)
commit8bd001f1282b7a33a71c0565504e160dbe567d5d
tree228f3c47b5db1cd7f9541eedbc944bd569eb627e
parentf349aeb06160a89fae6821604cb45802309d46cd
parente4c37036dbc39fe3d11b4e905497c7f0cea060a8
Merge remote-tracking branch 'upstream/pull/1809'
config/locales/en.yml