Merge pull request #19801 from eileenmcnaughton/mem_terms

author colemanw <coleman@civicrm.org>

Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)

committer GitHub <noreply@github.com>

Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)
author colemanw <coleman@civicrm.org>
Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)
committer GitHub <noreply@github.com>
Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)
diff --cc CRM/Member/Form/Membership.php
Simple merge
diff --cc tests/phpunit/CRM/Member/Form/MembershipTest.php
Simple merge
author	colemanw <coleman@civicrm.org>
	Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)
		1	2
CRM/Member/Form/Membership.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Member/Form/MembershipTest.php	patch \|	diff1 \|	diff2 \|	blob \| history