Merge "Treat phpdbg as run from the command line when checking PHP_SAPI"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 8 Jan 2018 23:03:41 +0000 (23:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 8 Jan 2018 23:03:41 +0000 (23:03 +0000)
1  2 
includes/GlobalFunctions.php
includes/libs/rdbms/database/Database.php
includes/libs/rdbms/loadbalancer/LoadBalancer.php
maintenance/Maintenance.php

Simple merge
Simple merge