Merge "Change default of $wgResourceLoaderMaxQueryLength to 2000"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 27 Mar 2015 22:45:56 +0000 (22:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Mar 2015 22:45:56 +0000 (22:45 +0000)
1  2 
includes/Setup.php
resources/src/mediawiki/mediawiki.js

Simple merge
Simple merge