Merge pull request #20027 from civicrm/5.37

author Eileen McNaughton <emcnaughton@wikimedia.org>

Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)

committer GitHub <noreply@github.com>

Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)
committer GitHub <noreply@github.com>
Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)
diff --cc CRM/Member/Form/Membership.php
Simple merge
diff --cc tests/phpunit/CRM/Member/Form/MembershipTest.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)
committer	GitHub <noreply@github.com>
	Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)
		1	2
CRM/Member/Form/Membership.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Member/Form/MembershipTest.php	patch \|	diff1 \|	diff2 \|	blob \| history