Merge "resourceloader: Update startup mock in jsduck/eg-iframe"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 10 Sep 2018 21:05:56 +0000 (21:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 10 Sep 2018 21:05:56 +0000 (21:05 +0000)

Trivial merge