Merge "resourceloader: Add $conf parameter to the 'ResourceLoaderGetConfigVars' hook"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 8 Sep 2019 02:37:44 +0000 (02:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 8 Sep 2019 02:37:44 +0000 (02:37 +0000)

Trivial merge