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)
commite7684f068748a99bd01bae52fa5ac717f9beb1bb
tree47e58e44448c298e26c69d4bbe91c6b2de293d51
parentc90aa71ce88e032a7e769f7a96c9b5ece2d08335
parentc6cc337be915d542716038eb0e18b89d31d023da
Merge pull request #17006 from mattwire/l10nallowoverrideinherit

Allow override of inherited CMS language when in CiviCRM