Merge pull request #17742 from MiyaNoctem/dev-core-1854-fix-resetting-overridden...
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 10 Sep 2020 01:23:46 +0000 (13:23 +1200)
committerGitHub <noreply@github.com>
Thu, 10 Sep 2020 01:23:46 +0000 (13:23 +1200)
dev/core#1854: Fix Calculation of Overridden Membership Status

1  2 
CRM/Member/BAO/Membership.php
tests/phpunit/CRM/Member/BAO/MembershipTest.php

Simple merge