Merge "Move MediaHandler defaults out of global scope"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Aug 2016 09:30:53 +0000 (09:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Aug 2016 09:30:53 +0000 (09:30 +0000)
1  2 
includes/DefaultSettings.php

Simple merge