Merge "$wgHttpsPort should only be used in very special cases"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 24 Jul 2018 01:13:32 +0000 (01:13 +0000)
commit1655c86faf49196f41aca75c8df80c0c4fa4fb90
treea43b1d378a803de4d5a6da7af34a7c802c927906
parent8ef91357819c1d1f90d4e6054ace504f625b246e
parent89629154496932504bebbcb06d85e94cb64b0a0d
Merge "$wgHttpsPort should only be used in very special cases"
includes/DefaultSettings.php
includes/GlobalFunctions.php