Merge pull request #21790 from eileenmcnaughton/greetings_earthling

author colemanw <coleman@civicrm.org>

Thu, 28 Oct 2021 21:39:02 +0000 (17:39 -0400)

committer GitHub <noreply@github.com>

Thu, 28 Oct 2021 21:39:02 +0000 (17:39 -0400)
author colemanw <coleman@civicrm.org>
Thu, 28 Oct 2021 21:39:02 +0000 (17:39 -0400)
committer GitHub <noreply@github.com>
Thu, 28 Oct 2021 21:39:02 +0000 (17:39 -0400)
diff --cc CRM/Utils/Token.php
Simple merge
diff --cc Civi/Api4/Query/Api4SelectQuery.php
Simple merge
diff --cc Civi/Api4/Utils/CoreUtil.php
Simple merge
author	colemanw <coleman@civicrm.org>
	Thu, 28 Oct 2021 21:39:02 +0000 (17:39 -0400)
committer	GitHub <noreply@github.com>
	Thu, 28 Oct 2021 21:39:02 +0000 (17:39 -0400)
		1	2
CRM/Utils/Token.php	patch \|	diff1 \|	diff2 \|	blob \| history
Civi/Api4/Query/Api4SelectQuery.php	patch \|	diff1 \|	diff2 \|	blob \| history
Civi/Api4/Utils/CoreUtil.php	patch \|	diff1 \|	diff2 \|	blob \| history