Merge "JavaScriptMinifier: Fix bad state after ternary in object literal"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 17 Aug 2018 19:10:10 +0000 (19:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 17 Aug 2018 19:10:10 +0000 (19:10 +0000)

Trivial merge