Merge "Fixes for more robust dealing with content handlers."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 30 Jan 2017 16:06:25 +0000 (16:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Jan 2017 16:06:25 +0000 (16:06 +0000)
1  2 
includes/search/SearchEngine.php

Simple merge