Merge "Make getScopedLockAndFlush() in Category::refreshCounts non-blocking" into...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 23 Apr 2018 16:21:42 +0000 (16:21 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 23 Apr 2018 16:21:42 +0000 (16:21 +0000)

Trivial merge