Merge "Allow callbacks to be passed to $wgContentHandlers"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 8 Feb 2016 09:11:21 +0000 (09:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 8 Feb 2016 09:11:21 +0000 (09:11 +0000)
1  2 
includes/DefaultSettings.php

Simple merge