Merge pull request #24539 from civicrm/5.54

author demeritcowboy <demeritcowboy@hotmail.com>

Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)

committer GitHub <noreply@github.com>

Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)
author demeritcowboy <demeritcowboy@hotmail.com>
Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)
committer GitHub <noreply@github.com>
Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)
diff --cc CRM/Core/DAO.php
Simple merge
diff --cc CRM/Logging/Schema.php
Simple merge
author	demeritcowboy <demeritcowboy@hotmail.com>
	Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)
committer	GitHub <noreply@github.com>
	Fri, 16 Sep 2022 17:07:21 +0000 (13:07 -0400)
		1	2
CRM/Core/DAO.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Logging/Schema.php	patch \|	diff1 \|	diff2 \|	blob \| history