Merge "$wgHttpsPort should only be used in very special cases"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history