Merge remote-tracking branch 'upstream/pull/1839'
authorTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:39:27 +0000 (17:39 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 25 Apr 2018 16:39:27 +0000 (17:39 +0100)
commitb15a8c73d9c555243952d300e19d6d4127843f19
treec9795339e21550b36f13f5f3a105697368c6ebbc
parent00425c8fcad370a7f596dafe8e188837fcb35130
parentaf4003e2eee24883318212e79f46d2ba4d2b9dbd
Merge remote-tracking branch 'upstream/pull/1839'
config/locales/en.yml