projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32d6b2f f76b27f)
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527
authorkurund <kurund@civicrm.org>
Mon, 17 Nov 2014 04:13:06 +0000 (09:43 +0530)
committerkurund <kurund@civicrm.org>
Mon, 17 Nov 2014 04:13:06 +0000 (09:43 +0530)
Conflicts:
templates/CRM/Event/Form/Participant.tpl

----------------------------------------
* CRM-15474: Event cart option js breaks "add participant" form
  https://issues.civicrm.org/jira/browse/CRM-15474
* CRM-15527: error in IPN relating to numRelatedMemberships
  https://issues.civicrm.org/jira/browse/CRM-15527

1  2 
CRM/Core/Form.php patch | diff1 | diff2 | blob | history

diff --cc CRM/Core/Form.php
Simple merge