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)
commitf99c383318c4f9ea15639f0566f3e42db4e2c8b1
treef1e5ddfdfd00fe50c31dca3340584db190292682
parent5d8e1922fe92578e2a9352bbc2a40f9165fcf756
parent90ac07d071ed8dbfdea6214419e1b5205a529b2f
Merge remote-tracking branch 'upstream/pull/2225'
config/locales/en.yml
config/settings.yml