Merge pull request #21521 from eileenmcnaughton/member_tokens

author Monish Deb <monish.deb@jmaconsulting.biz>

Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)

committer GitHub <noreply@github.com>

Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)
author Monish Deb <monish.deb@jmaconsulting.biz>
Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)
committer GitHub <noreply@github.com>
Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)
diff --cc CRM/Member/Form/Task/PDFLetter.php
Simple merge
diff --cc CRM/Utils/Token.php
Simple merge
author	Monish Deb <monish.deb@jmaconsulting.biz>
	Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)
committer	GitHub <noreply@github.com>
	Wed, 29 Sep 2021 03:44:01 +0000 (09:14 +0530)
		1	2
CRM/Member/Form/Task/PDFLetter.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Token.php	patch \|	diff1 \|	diff2 \|	blob \| history