Merge "resourceloader: Document encodeJsonForScript() type as mixed"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 4 Sep 2019 20:47:04 +0000 (20:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 4 Sep 2019 20:47:04 +0000 (20:47 +0000)

Trivial merge