Merge "resourceloader: Implement '$pages' parameter to ResourceLoaderWikiModule const...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 3 Mar 2015 22:52:22 +0000 (22:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Mar 2015 22:52:22 +0000 (22:52 +0000)
1  2 
autoload.php
resources/Resources.php

diff --cc autoload.php
Simple merge
Simple merge