Merge pull request #10403 from yashodha/CRM-20624

author Eileen McNaughton <eileen@mcnaughty.com>

Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)

committer GitHub <noreply@github.com>

Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)
author Eileen McNaughton <eileen@mcnaughty.com>
Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)
committer GitHub <noreply@github.com>
Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)
diff --cc CRM/Core/BAO/CustomOption.php
Simple merge
diff --cc CRM/Custom/Form/Option.php
Simple merge
diff --cc CRM/Custom/Page/AJAX.php
Simple merge
diff --cc templates/CRM/Custom/Form/Option.tpl
Simple merge
diff --cc templates/CRM/Custom/Page/Option.tpl
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)
committer	GitHub <noreply@github.com>
	Mon, 19 Mar 2018 21:31:23 +0000 (10:31 +1300)
		1	2
CRM/Core/BAO/CustomOption.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Custom/Form/Option.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Custom/Page/AJAX.php	patch \|	diff1 \|	diff2 \|	blob \| history
templates/CRM/Custom/Form/Option.tpl	patch \|	diff1 \|	diff2 \|	blob \| history
templates/CRM/Custom/Page/Option.tpl	patch \|	diff1 \|	diff2 \|	blob \| history