Merge "resourceloader: Move startup code from PHP to startup.js"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Jul 2015 10:51:52 +0000 (10:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Jul 2015 10:51:52 +0000 (10:51 +0000)

Trivial merge