Merge in 5.27

author Seamus Lee <seamuslee001@gmail.com>

Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)

committer Seamus Lee <seamuslee001@gmail.com>

Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)
author Seamus Lee <seamuslee001@gmail.com>
Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)
committer Seamus Lee <seamuslee001@gmail.com>
Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)
diff --cc CRM/Core/DAO/OptionValue.php
Simple merge
diff --cc api/v3/utils.php
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)
committer	Seamus Lee <seamuslee001@gmail.com>
	Tue, 16 Jun 2020 04:19:37 +0000 (14:19 +1000)
		1	2
CRM/Core/DAO/OptionValue.php	patch \|	diff1 \|	diff2 \|	blob \| history
api/v3/utils.php	patch \|	diff1 \|	diff2 \|	blob \| history