projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a68a78 a35ed67)
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-14-08-55-09
authorkurund <kurund@civicrm.org>
Thu, 14 May 2015 03:25:17 +0000 (08:55 +0530)
committerkurund <kurund@civicrm.org>
Thu, 14 May 2015 03:25:17 +0000 (08:55 +0530)
1  2 
CRM/Member/Form/Membership.php patch | diff1 | diff2 | blob | history
CRM/Member/Form/MembershipRenewal.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Member/Form/Membership.php
Simple merge
diff --cc CRM/Member/Form/MembershipRenewal.php
Simple merge