Merge "Tidy up conditions for applying a block from a cookie"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Jul 2019 18:02:36 +0000 (18:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Jul 2019 18:02:36 +0000 (18:02 +0000)

Trivial merge