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

Simple merge