Merge remote-tracking branch 'upstream/pull/2225'
authorTom Hughes <tom@compton.nu>
Thu, 30 May 2019 17:06:58 +0000 (18:06 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 30 May 2019 17:06:58 +0000 (18:06 +0100)
1  2 
config/locales/en.yml
config/settings.yml

Simple merge
Simple merge