Merge pull request #10887 from eileenmcnaughton/member

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

Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)

committer GitHub <noreply@github.com>

Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)
author Monish Deb <monish.deb@jmaconsulting.biz>
Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)
committer GitHub <noreply@github.com>
Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)
diff --cc CRM/Member/Form/Membership.php
Simple merge
diff --cc CRM/Member/Form/MembershipRenewal.php
Simple merge
author	Monish Deb <monish.deb@jmaconsulting.biz>
	Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)
committer	GitHub <noreply@github.com>
	Fri, 29 Sep 2017 10:43:59 +0000 (16:13 +0530)
		1	2
CRM/Member/Form/Membership.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Member/Form/MembershipRenewal.php	patch \|	diff1 \|	diff2 \|	blob \| history