Merge pull request #20860 from civicrm/5.40
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 15 Jul 2021 20:57:34 +0000 (08:57 +1200)
committerGitHub <noreply@github.com>
Thu, 15 Jul 2021 20:57:34 +0000 (08:57 +1200)
commit0a7b86717573ed909202ca4d7fa248bbad203971
tree5324673889daee49186e5019daa5f4aa58bb9ef2
parentb6601e07a902dcffcb9c46e113c52d7020aa8066
parentf93f03fb422f451d9ce8365f103366ac47013ff6
Merge pull request #20860 from civicrm/5.40

5.40 to master