Merge "Avoid DBPerformance warnings on PURGE/TRACE requests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 26 May 2016 16:45:07 +0000 (16:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 26 May 2016 16:45:07 +0000 (16:45 +0000)
1  2 
includes/api/ApiMain.php

Simple merge