Merge pull request #19756 from eileenmcnaughton/mem2

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

Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)

committer GitHub <noreply@github.com>

Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)
author Monish Deb <monish.deb@jmaconsulting.biz>
Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)
committer GitHub <noreply@github.com>
Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)
diff --cc CRM/Member/Form/Membership.php
Simple merge
diff --cc tests/phpunit/CRM/Member/Form/MembershipTest.php
Simple merge
author	Monish Deb <monish.deb@jmaconsulting.biz>
	Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)
committer	GitHub <noreply@github.com>
	Thu, 11 Mar 2021 14:04:04 +0000 (19:34 +0530)
		1	2
CRM/Member/Form/Membership.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Member/Form/MembershipTest.php	patch \|	diff1 \|	diff2 \|	blob \| history