Merge "Check whether TYPE_COMBINED modules are allowed to be included in the page"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 30 Jul 2014 13:45:20 +0000 (13:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 30 Jul 2014 13:45:20 +0000 (13:45 +0000)
commit46343ca0dd56a8299f1a4078f45a7efe26de1213
tree21e42ad12fc6a8cb53b8178db7852128fb237d27
parentb76c35d25d1246c2b0ba0b48bbd8933a9e7ab54b
parent5518d3ac02c8be4881aa2a61d22f2077be874391
Merge "Check whether TYPE_COMBINED modules are allowed to be included in the page"
includes/OutputPage.php