projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite612dc821894de0df124892584a5f52d44f5297a
tree9c99eccac8c163225db9d027cbc55a93c91239detree | snapshot (zip tar.gz)
parent32d6b2f9b2a7cab7e1f8ab70b72c38270c87d27ecommit | diff
parentf76b27feb9704f550f1de7a4d90ff3e66c3b6d7ccommit | diff
Merge branch 'CRM-15474' of github.com:colemanw/civicrm-core into CRM-15527

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
CRM/Core/Form.php diff1 | diff2 | blob | history