Merge "Make HTTPS port configurable"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 May 2014 22:47:03 +0000 (22:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 May 2014 22:47:03 +0000 (22:47 +0000)
commit4f42c2bbe4184830986910f9374bf913590b0096
tree307c93997d91899119dc2f1092f2f15666ebe308
parent17b631a1719a70a9490740a3ceb58d4ca70cb333
parent86f68d31d32c1796ee1699421a6c06df824253cc
Merge "Make HTTPS port configurable"
includes/DefaultSettings.php
includes/GlobalFunctions.php