Merge pull request #17006 from mattwire/l10nallowoverrideinherit
authorMatthew Wire <mjw@mjwconsult.co.uk>
Mon, 4 May 2020 11:45:19 +0000 (12:45 +0100)
committerGitHub <noreply@github.com>
Mon, 4 May 2020 11:45:19 +0000 (12:45 +0100)
Allow override of inherited CMS language when in CiviCRM


Trivial merge