Merge pull request #20098 from eileenmcnaughton/536
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 19 Apr 2021 03:01:31 +0000 (15:01 +1200)
committerGitHub <noreply@github.com>
Mon, 19 Apr 2021 03:01:31 +0000 (15:01 +1200)
commitddb6be26567bb890279471dcf2d6c52eb50dab37
treed6a09df16051cdfd93c789491534277c901dc42f
parentfaa0e6acb3e4378ae47bb7d97d9ca012f1d80d30
parent6c990cc907aea7e7a9eac0134e1ed9ef1800f086
Merge pull request #20098 from eileenmcnaughton/536

Port https://github.com/civicrm/civicrm-core/pull/20040