Merge "Improve some timeout docs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Aug 2017 19:56:48 +0000 (19:56 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Aug 2017 19:56:48 +0000 (19:56 +0000)
1  2 
includes/DefaultSettings.php

Simple merge