Merge pull request #16753 from agh1/consolidated-php-version

author Tim Otten <totten@civicrm.org>

Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)

committer GitHub <noreply@github.com>

Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)
author Tim Otten <totten@civicrm.org>
Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)
committer GitHub <noreply@github.com>
Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)
diff --cc CRM/Upgrade/Form.php
Simple merge
diff --cc CRM/Utils/Check/Component/Env.php
Simple merge
diff --cc install/index.php
Simple merge
author	Tim Otten <totten@civicrm.org>
	Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)
committer	GitHub <noreply@github.com>
	Thu, 2 Apr 2020 04:57:15 +0000 (21:57 -0700)
		1	2
CRM/Upgrade/Form.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Utils/Check/Component/Env.php	patch \|	diff1 \|	diff2 \|	blob \| history
install/index.php	patch \|	diff1 \|	diff2 \|	blob \| history