Merge pull request #25634 from eileenmcnaughton/except

author Tim Otten <totten@civicrm.org>

Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)

committer GitHub <noreply@github.com>

Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)
author Tim Otten <totten@civicrm.org>
Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)
committer GitHub <noreply@github.com>
Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)
diff --cc CRM/Core/DAO.php
Simple merge
diff --cc CRM/Core/Error.php
Simple merge
author	Tim Otten <totten@civicrm.org>
	Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)
committer	GitHub <noreply@github.com>
	Thu, 2 Mar 2023 22:48:32 +0000 (14:48 -0800)
		1	2
CRM/Core/DAO.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/Error.php	patch \|	diff1 \|	diff2 \|	blob \| history