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)
1  2 
includes/DefaultSettings.php
includes/GlobalFunctions.php

Simple merge
Simple merge