Merge pull request #22297 from civicrm/5.45

author Seamus Lee <seamuslee001@gmail.com>

Wed, 22 Dec 2021 11:01:50 +0000 (22:01 +1100)

committer GitHub <noreply@github.com>

Wed, 22 Dec 2021 11:01:50 +0000 (22:01 +1100)
author Seamus Lee <seamuslee001@gmail.com>
Wed, 22 Dec 2021 11:01:50 +0000 (22:01 +1100)
committer GitHub <noreply@github.com>
Wed, 22 Dec 2021 11:01:50 +0000 (22:01 +1100)
diff --cc contributor-key.yml
Simple merge
diff --cc ext/search_kit/ang/crmSearchAdmin.module.js
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Wed, 22 Dec 2021 11:01:50 +0000 (22:01 +1100)
committer	GitHub <noreply@github.com>
	Wed, 22 Dec 2021 11:01:50 +0000 (22:01 +1100)
		1	2
contributor-key.yml	patch \|	diff1 \|	diff2 \|	blob \| history
ext/search_kit/ang/crmSearchAdmin.module.js	patch \|	diff1 \|	diff2 \|	blob \| history