Merge pull request #17139 from civicrm/5.25

author Seamus Lee <seamuslee001@gmail.com>

Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +1000)

committer GitHub <noreply@github.com>

Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +1000)
author Seamus Lee <seamuslee001@gmail.com>
Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +1000)
committer GitHub <noreply@github.com>
Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +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>
	Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +1000)
committer	GitHub <noreply@github.com>
	Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +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