Merge "ESLint ecmaVersion setting is not needed if env is es6"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 28 Nov 2017 13:38:15 +0000 (13:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Nov 2017 13:38:15 +0000 (13:38 +0000)

Trivial merge