Merge pull request #11298 from otetard/feature/merge_memberships
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 22 Mar 2018 13:10:12 +0000 (02:10 +1300)
committerGitHub <noreply@github.com>
Thu, 22 Mar 2018 13:10:12 +0000 (02:10 +1300)
CRM-19151: Add the ability to merge memberships without data loss


Trivial merge