Merge "Check for $wgAllowUserCss and $wgAllowUserJs in EditPage.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 25 Jun 2014 22:44:02 +0000 (22:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 25 Jun 2014 22:44:02 +0000 (22:44 +0000)
1  2 
includes/EditPage.php

Simple merge