Merge pull request #22483 from eileenmcnaughton/token1

author Matthew Wire <devel@mrwire.co.uk>

Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)

committer GitHub <noreply@github.com>

Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)
author Matthew Wire <devel@mrwire.co.uk>
Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)
committer GitHub <noreply@github.com>
Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)
diff --cc CRM/Utils/Token.php
Simple merge
diff --cc tests/phpunit/api/v3/MailingTest.php
Simple merge
author	Matthew Wire <devel@mrwire.co.uk>
	Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)
committer	GitHub <noreply@github.com>
	Wed, 9 Mar 2022 21:56:17 +0000 (21:56 +0000)
		1	2
CRM/Utils/Token.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/api/v3/MailingTest.php	patch \|	diff1 \|	diff2 \|	blob \| history