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)
1  2 
config/locales/en.yml

Simple merge