Merge pull request #17217 from civicrm/5.25

author Seamus Lee <seamuslee001@gmail.com>

Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)

committer GitHub <noreply@github.com>

Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)
author Seamus Lee <seamuslee001@gmail.com>
Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)
committer GitHub <noreply@github.com>
Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)
diff --cc CRM/Contact/BAO/Query.php
Simple merge
diff --cc tests/phpunit/CRM/Contact/BAO/QueryTest.php
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)
committer	GitHub <noreply@github.com>
	Fri, 1 May 2020 21:52:09 +0000 (07:52 +1000)
		1	2
CRM/Contact/BAO/Query.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/CRM/Contact/BAO/QueryTest.php	patch \|	diff1 \|	diff2 \|	blob \| history