Merge pull request #27659 from colemanw/contactTypeApi

author Tim Otten <totten@civicrm.org>

Tue, 3 Oct 2023 05:31:52 +0000 (22:31 -0700)

committer GitHub <noreply@github.com>

Tue, 3 Oct 2023 05:31:52 +0000 (22:31 -0700)
author Tim Otten <totten@civicrm.org>
Tue, 3 Oct 2023 05:31:52 +0000 (22:31 -0700)
committer GitHub <noreply@github.com>
Tue, 3 Oct 2023 05:31:52 +0000 (22:31 -0700)
diff --cc Civi/Api4/Generic/AbstractEntity.php
Simple merge
diff --cc Civi/Api4/Utils/CoreUtil.php
Simple merge
author	Tim Otten <totten@civicrm.org>
	Tue, 3 Oct 2023 05:31:52 +0000 (22:31 -0700)
committer	GitHub <noreply@github.com>
	Tue, 3 Oct 2023 05:31:52 +0000 (22:31 -0700)
		1	2
Civi/Api4/Generic/AbstractEntity.php	patch \|	diff1 \|	diff2 \|	blob \| history
Civi/Api4/Utils/CoreUtil.php	patch \|	diff1 \|	diff2 \|	blob \| history