Merge pull request #14192 from civicrm/5.14

author Eileen McNaughton <emcnaughton@wikimedia.org>

Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)

committer GitHub <noreply@github.com>

Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)
author Eileen McNaughton <emcnaughton@wikimedia.org>
Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)
committer GitHub <noreply@github.com>
Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)
diff --cc CRM/Utils/System.php
Simple merge
diff --cc CRM/Utils/System/Base.php
Simple merge
author	Eileen McNaughton <emcnaughton@wikimedia.org>
	Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)
committer	GitHub <noreply@github.com>
	Fri, 3 May 2019 01:26:13 +0000 (13:26 +1200)
		1	2
CRM/Utils/System.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Utils/System/Base.php	patch \|	diff1 \|	diff2 \|	blob \| history