From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 17 Aug 2018 19:10:10 +0000 (+0000)
Subject: Merge "JavaScriptMinifier: Fix bad state after ternary in object literal"
X-Git-Tag: 1.34.0-rc.0~4394
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=26e8ff635263c0cb5ff314adcbadcd4f5c8e0675;p=lhc%2Fweb%2Fwiklou.git

Merge "JavaScriptMinifier: Fix bad state after ternary in object literal"
---

26e8ff635263c0cb5ff314adcbadcd4f5c8e0675