Merge pull request #11154 from agileware/CRM-20421
authorcolemanw <coleman@civicrm.org>
Fri, 23 Feb 2018 04:23:24 +0000 (23:23 -0500)
committerGitHub <noreply@github.com>
Fri, 23 Feb 2018 04:23:24 +0000 (23:23 -0500)
commit762fe657a5358316e29344b2778c254e9d7517a7
tree4a3ef50229127f656777377c99780c7d82778c28
parent662a7463d6363261eda532d2d213a6df33fd9370
parent4099a9c51f7137cfb46ae3378278042689fdfec8
Merge pull request #11154 from agileware/CRM-20421

CRM-20421: Inherited memberships are converted to individual memberships when the "parent" for the membership is merged with another contact
CRM/Dedupe/Merger.php
tests/phpunit/api/v3/ContactTest.php