Merge "Remove fixed phpcs:ignore"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Oct 2018 18:54:35 +0000 (18:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Oct 2018 18:54:35 +0000 (18:54 +0000)

Trivial merge