Merge "resourceloader: avoid use of $.globalEval in mediawiki.js"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 16 May 2018 16:40:07 +0000 (16:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 16 May 2018 16:40:07 +0000 (16:40 +0000)

Trivial merge