Merge "resourceloader: move hook() and html() from mediawiki.js to base module"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Jun 2018 21:09:57 +0000 (21:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Jun 2018 21:09:57 +0000 (21:09 +0000)

Trivial merge