Merge pull request #21753 from civicrm/5.42
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 6 Oct 2021 22:38:42 +0000 (11:38 +1300)
committerGitHub <noreply@github.com>
Wed, 6 Oct 2021 22:38:42 +0000 (11:38 +1300)
Merge 5.42 to master

1  2 
ext/search_kit/search_kit.php

Simple merge