Merge pull request #16577 from civicrm/5.23
authorEileen McNaughton <emcnaughton@wikimedia.org>
Mon, 17 Feb 2020 22:57:11 +0000 (11:57 +1300)
committerGitHub <noreply@github.com>
Mon, 17 Feb 2020 22:57:11 +0000 (11:57 +1300)
commita9ee569565e432755ae0cb62df941067b9df8061
tree8a76867ba450a2c1d4f1d58752234da5c059dc57
parentdb9e0947e008ba06308da5664e5c36a3bc2736df
parent5c31ed8f21d827c2738c955062b885ea8b8f57f5
Merge pull request #16577 from civicrm/5.23

5.23 to master
CRM/Dedupe/BAO/Rule.php
tests/phpunit/CRM/Dedupe/DedupeFinderTest.php